You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/12/22 19:25:57 UTC
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-nw httpd.conf-dist-win
wrowe 01/12/22 10:25:57
Modified: conf httpd.conf-dist httpd.conf-dist-nw
httpd.conf-dist-win
Log:
Already patched in the 2.0 tree - make all .conf's reflect the applicable
DNS rfc's that underbars aren't permitted - why should our examples show
administrators otherwise?!?
Revision Changes Path
1.78 +7 -7 apache-1.3/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- httpd.conf-dist 2001/10/06 03:40:04 1.77
+++ httpd.conf-dist 2001/12/22 18:25:57 1.78
@@ -851,7 +851,7 @@
# N.B.: You can redirect to a script or a document using server-side-includes.
#
# 3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
# N.B.: Many of the environment variables associated with the original
# request will *not* be available to such a script.
@@ -885,25 +885,25 @@
#
# Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
#
#<Location /server-status>
# SetHandler server-status
# Order deny,allow
# Deny from all
-# Allow from .your_domain.com
+# Allow from .your-domain.com
#</Location>
#
# Allow remote server configuration reports, with the URL of
# http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
#
#<Location /server-info>
# SetHandler server-info
# Order deny,allow
# Deny from all
-# Allow from .your_domain.com
+# Allow from .your-domain.com
#</Location>
#
@@ -928,7 +928,7 @@
# <Directory proxy:*>
# Order deny,allow
# Deny from all
-# Allow from .your_domain.com
+# Allow from .your-domain.com
# </Directory>
#
@@ -948,7 +948,7 @@
# CacheMaxExpire 24
# CacheLastModifiedFactor 0.1
# CacheDefaultExpire 1
-# NoCache a_domain.com another_domain.edu joes.garage_sale.com
+# NoCache a-domain.com another-domain.edu joes.garage-sale.com
#</IfModule>
# End of proxy directives.
1.19 +13 -13 apache-1.3/conf/httpd.conf-dist-nw
Index: httpd.conf-dist-nw
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-nw,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- httpd.conf-dist-nw 2001/10/23 15:43:28 1.18
+++ httpd.conf-dist-nw 2001/12/22 18:25:57 1.19
@@ -786,7 +786,7 @@
# N.B.: You can redirect to a script or a document using server-side-includes.
#
# 3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
# N.B.: Many of the environment variables associated with the original
# request will *not* be available to such a script.
@@ -819,28 +819,28 @@
#
# Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
#
<IfModule mod_status.c>
<Location /server-status>
SetHandler server-status
Order deny,allow
Deny from all
- Allow from .your_domain.com
+ Allow from .your-domain.com
</Location>
</IfModule>
#
# Allow remote server configuration reports, with the URL of
# http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
#
<IfModule mod_info.c>
<Location /server-info>
SetHandler server-info
Order deny,allow
Deny from all
- Allow from .your_domain.com
+ Allow from .your-domain.com
</Location>
</IfModule>
@@ -866,7 +866,7 @@
#<Directory proxy:*>
# Order deny,allow
# Deny from all
-# Allow from .your_domain.com
+# Allow from .your-domain.com
#</Directory>
#
@@ -886,7 +886,7 @@
#CacheMaxExpire 24
#CacheLastModifiedFactor 0.1
#CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
#</IfModule>
# End of proxy directives.
@@ -911,12 +911,12 @@
# VirtualHost example:
# Almost any Apache directive may go into a VirtualHost container.
#
-#<VirtualHost ip.address.of.host.some_domain.com>
-# ServerAdmin webmaster@host.some_domain.com
-# DocumentRoot /www/docs/host.some_domain.com
-# ServerName host.some_domain.com
-# ErrorLog logs/host.some_domain.com-error_log
-# CustomLog logs/host.some_domain.com-access_log common
+#<VirtualHost ip.address.of.host.some-domain.com>
+# ServerAdmin webmaster@host.some-domain.com
+# DocumentRoot /www/docs/host.some-domain.com
+# ServerName host.some-domain.com
+# ErrorLog logs/host.some-domain.com-error_log
+# CustomLog logs/host.some-domain.com-access_log common
#</VirtualHost>
#<VirtualHost _default_:*>
1.63 +2 -2 apache-1.3/conf/httpd.conf-dist-win
Index: httpd.conf-dist-win
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- httpd.conf-dist-win 2001/10/06 03:40:04 1.62
+++ httpd.conf-dist-win 2001/12/22 18:25:57 1.63
@@ -896,7 +896,7 @@
# N.B.: You can redirect to a script or a document using server-side-includes.
#
# 3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
# N.B.: Many of the environment variables associated with the original
# request will *not* be available to such a script.
@@ -993,7 +993,7 @@
# CacheMaxExpire 24
# CacheLastModifiedFactor 0.1
# CacheDefaultExpire 1
-# NoCache a_domain.com another_domain.edu joes.garage_sale.com
+# NoCache a-domain.com another-domain.edu joes.garage-sale.com
#</IfModule>
# End of proxy directives.
Re: cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-nw httpd.conf-dist-win
Posted by "Roy T. Fielding" <fi...@ebuilt.com>.
> Already patched in the 2.0 tree - make all .conf's reflect the applicable
> DNS rfc's that underbars aren't permitted - why should our examples show
> administrators otherwise?!?
Because we did not want them to be valid DNS names because someone will
register a porn site just to pick up the links from our examples.
They should be changed to whatever.example.com now that example.com is
the "official" example domain.
....Roy