httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/docs/conf httpd-nw.conf httpd-std.conf httpd-win.conf proxy-std.conf
Date Mon, 22 Oct 2001 12:46:29 GMT
wrowe       01/10/22 05:46:29

  Modified:    .        STATUS Makefile.win Makefile.in
               docs/conf httpd-nw.conf httpd-std.conf httpd-win.conf
  Removed:     docs/conf proxy-std.conf
  Log:
    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
  
  Revision  Changes    Path
  1.316     +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.315
  retrieving revision 1.316
  diff -u -r1.315 -r1.316
  --- STATUS	2001/10/19 06:11:52	1.315
  +++ STATUS	2001/10/22 12:46:29	1.316
  @@ -1,5 +1,5 @@
   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:
   
  @@ -34,11 +34,6 @@
       * docs/STATUS
   
   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 
  
  
  
  1.82      +0 -15     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- Makefile.win	2001/10/19 21:08:43	1.81
  +++ Makefile.win	2001/10/22 12:46:29	1.82
  @@ -457,21 +457,6 @@
   <<
   	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)" ); 
  
  
  
  1.91      +1 -1      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- Makefile.in	2001/10/18 20:56:49	1.90
  +++ Makefile.in	2001/10/22 12:46:29	1.91
  @@ -34,7 +34,7 @@
   	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`; \
  
  
  
  1.6       +35 -3     httpd-2.0/docs/conf/httpd-nw.conf
  
  Index: httpd-nw.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-nw.conf,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- httpd-nw.conf	2001/10/17 22:48:14	1.5
  +++ httpd-nw.conf	2001/10/22 12:46:29	1.6
  @@ -858,15 +858,47 @@
   #</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
   #
   <IfModule mod_ssl.c>
       Include conf/ssl.conf
   </IfModule>
   
  -<IfModule mod_proxy.c>
  -    Include conf/proxy.conf
  -</IfModule>
   
   ### Section 3: Virtual Hosts
   #
  
  
  
  1.61      +35 -8     httpd-2.0/docs/conf/httpd-std.conf
  
  Index: httpd-std.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- httpd-std.conf	2001/10/17 15:37:19	1.60
  +++ httpd-std.conf	2001/10/22 12:46:29	1.61
  @@ -926,18 +926,45 @@
   #</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
   #
   <IfModule mod_ssl.c>
       Include conf/ssl.conf
  -</IfModule>
  -
  -<IfModule mod_proxy.c>
  -    Include conf/proxy.conf
  -</IfModule>
  -
  -<IfModule mod_ldap.c>
  -    Include conf/ldap.conf
   </IfModule>
   
   
  
  
  
  1.47      +35 -4     httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- httpd-win.conf	2001/10/17 15:37:19	1.46
  +++ httpd-win.conf	2001/10/22 12:46:29	1.47
  @@ -849,14 +849,45 @@
   #</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
   #
   <IfModule mod_ssl.c>
       Include conf/ssl.conf
  -</IfModule>
  -
  -<IfModule mod_proxy.c>
  -    Include conf/proxy.conf
   </IfModule>
   
   
  
  
  

Mime
View raw message