Commit 7202a1d6 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Remerge proxy configuration.  Tally: of 9 votes;

  Majority for segregating mod_ssl
  Minority for segregating mod_proxy

  Also remove a lingering bit of ldap config from httpd-std.conf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91631 13f79535-47bb-0310-9956-ffa450edef68
parent 32d63f83

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ install-conf: 
	for i in mime.types magic; do \

		$(INSTALL_DATA) $$i $(sysconfdir); \

	done; \

	for i in *-std* ldap.conf proxy.conf ssl.conf; do \

	for i in *-std* ssl.conf; do \

		[ -f $$i ] || continue; \

		( \

			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \

Makefile.win

+0 −15
Original line number Diff line number Diff line
@@ -457,21 +457,6 @@ _install: 
<<

	if not exist "$(INSTDIR)\conf\ssl.conf" \

            copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"

	copy docs\conf\proxy-std.conf "$(INSTDIR)\conf\proxy.default.conf"

	-awk -f <<script.awk "docs\conf\proxy-std.conf" "$(INSTDIR)\conf\proxy.default.conf" "$(INSTDIR)"

    BEGIN { 

        srcfl = ARGV[1];

        dstfl = ARGV[2];

        serverroot = ARGV[3];

        gsub( /\\/, "/", serverroot );

        while ( ( getline < srcfl ) > 0 ) {

            gsub( /@@ServerRoot@@/, serverroot );

            print $$0 > dstfl;

        }

    }

<<

	if not exist "$(INSTDIR)\conf\proxy.conf" \

            copy "$(INSTDIR)\conf\proxy.default.conf" "$(INSTDIR)\conf\proxy.conf"

	awk -f <<script.awk "support\dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"

    { if ( $$0 ~ /^BEGIN { @AnyDBM_File::/ ) {

          sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" );

STATUS

+1 −6
Original line number Diff line number Diff line 
APACHE 2.0 STATUS:						-*-text-*-

Last modified at [$Date: 2001/10/19 06:11:52 $]

Last modified at [$Date: 2001/10/22 12:46:29 $]



Release:
@@ -35,11 +35,6 @@ on related projects: 


RELEASE SHOWSTOPPERS:



    * The recent split of proxy.conf and ssl.conf, good or bad?

        Split ssl.conf & proxy.conf: +1 OtherBill, Aaron, Ken

        Split out ssl.conf only:     +1 Ryan, BrianH, Jim

        Everything in httpd.conf:    +1 Cliff, Justin, Joshua



    * If any request gets to the core handler, without a flag that this 

      r->filename was tested by dir/file_walk, we need to 500 at the very 

      end of the ap_process_request_internal() processing.  This provides

docs/conf/httpd-nw.conf

+35 −3
Original line number Diff line number Diff line
@@ -857,6 +857,41 @@ BrowserMatch "JDK/1\.0" force-response-1.0 
#    Allow from .@@DomainName@@

#</Location>



#

# Proxy Server directives. Uncomment the following lines to

# enable the proxy server:

#

#<IfModule mod_proxy.c>

#ProxyRequests On

#

#<Proxy *>

#    Order deny,allow

#    Deny from all

#    Allow from .your_domain.com

#</Proxy>



#

# Enable/disable the handling of HTTP/1.1 "Via:" headers.

# ("Full" adds the server version; "Block" removes all outgoing Via: headers)

# Set to one of: Off | On | Full | Block

#

#ProxyVia On



#

# To enable the cache as well, edit and uncomment the following lines:

# (no cacheing without CacheRoot)

#

#CacheRoot "@@ServerRoot@@/proxy"

#CacheSize 5

#CacheGcInterval 4

#CacheMaxExpire 24

#CacheLastModifiedFactor 0.1

#CacheDefaultExpire 1

#NoCache a_domain.com another_domain.edu joes.garage_sale.com



#</IfModule>

# End of proxy directives.



#

# Bring in additional module-specific configurations

#
@@ -864,9 +899,6 @@ BrowserMatch "JDK/1\.0" force-response-1.0 
    Include conf/ssl.conf

</IfModule>



<IfModule mod_proxy.c>

    Include conf/proxy.conf

</IfModule>



### Section 3: Virtual Hosts

#

docs/conf/httpd-std.conf

+35 −8
Original line number Diff line number Diff line
@@ -925,6 +925,41 @@ BrowserMatch "JDK/1\.0" force-response-1.0 
#    Allow from .your_domain.com

#</Location>



#

# Proxy Server directives. Uncomment the following lines to

# enable the proxy server:

#

#<IfModule mod_proxy.c>

#ProxyRequests On

#

#<Proxy *>

#    Order deny,allow

#    Deny from all

#    Allow from .your_domain.com

#</Proxy>



#

# Enable/disable the handling of HTTP/1.1 "Via:" headers.

# ("Full" adds the server version; "Block" removes all outgoing Via: headers)

# Set to one of: Off | On | Full | Block

#

#ProxyVia On



#

# To enable the cache as well, edit and uncomment the following lines:

# (no cacheing without CacheRoot)

#

#CacheRoot "@@ServerRoot@@/proxy"

#CacheSize 5

#CacheGcInterval 4

#CacheMaxExpire 24

#CacheLastModifiedFactor 0.1

#CacheDefaultExpire 1

#NoCache a_domain.com another_domain.edu joes.garage_sale.com



#</IfModule>

# End of proxy directives.



#

# Bring in additional module-specific configurations

#
@@ -932,14 +967,6 @@ BrowserMatch "JDK/1\.0" force-response-1.0 
    Include conf/ssl.conf

</IfModule>



<IfModule mod_proxy.c>

    Include conf/proxy.conf

</IfModule>



<IfModule mod_ldap.c>

    Include conf/ldap.conf

</IfModule>





### Section 3: Virtual Hosts

#