As in 2.0: remove the proxy config from httpd.conf to try to prevent

people from shooting themselves in the foot.

A similar example that people can cut-and-paste is now in the
mod_proxy docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@100764 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index e442242474bb474d100b90a59654d2d315c0b5d2..f517ca56a5cdc9eb497e998d1b0375edc05398e8 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -907,41 +907,6 @@ ServerSignature On
 #    ErrorDocument 403 http://phf.apache.org/phf_abuse_log.cgi
 #</Location>
 
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#    ProxyRequests On
-
-#    <Directory proxy:*>
-#        Order deny,allow
-#        Deny from all
-#        Allow from .your-domain.com
-#    </Directory>
-
-    #
-    # 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.
-
 ### Section 3: Virtual Hosts
 #
 # VirtualHost: If you want to maintain multiple domains/hostnames on your

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 938aa5c0ce8dd0b5c1c6cdae7e87561caa6abf09..b0a89e716a6f627097e8c03e6c391b6d13c2a3e5 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -856,41 +856,6 @@ ServerSignature On
 #    ErrorDocument 403 http://phf.apache.org/phf_abuse_log.cgi
 #</Location>
 
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#ProxyRequests On
-#
-#<Directory proxy:*>
-#    Order deny,allow
-#    Deny from all
-#    Allow from .your-domain.com
-#</Directory>
-
-#
-# 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 "sys:/apache/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.
-
 ### Section 3: Virtual Hosts
 #
 # VirtualHost: If you want to maintain multiple domains/hostnames on your

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 02dadb45a07e3578c0aaaba000dc4d5e732b3858..264c5da7fcf87f2c6125ef72f8029a6804881fe7 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -953,41 +953,6 @@ ServerSignature On
 #    ErrorDocument 403 http://phf.apache.org/phf_abuse_log.cgi
 #</Location>
 
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#    ProxyRequests On
-
-#    <Directory proxy:*>
-#        Order deny,allow
-#        Deny from all
-#        Allow from @@Domain@@
-#    </Directory>
-
-    #
-    # 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.
-
 ### Section 3: Virtual Hosts
 #
 # VirtualHost: If you want to maintain multiple domains/hostnames on your