From: Takashi Sato Date: Wed, 21 May 2008 03:43:04 +0000 (+0000) Subject: Merge r657842 and r658546 from trunk: X-Git-Tag: 2.2.9~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=697aa00c0c0e542aaa6e44b04f9e95e1be923d85;p=thirdparty%2Fapache%2Fhttpd.git Merge r657842 and r658546 from trunk: We should not use someone's domains for examples. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@658547 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml index 3d1fa2542b7..32ab782b9c0 100644 --- a/docs/manual/howto/public_html.xml +++ b/docs/manual/howto/public_html.xml @@ -114,12 +114,12 @@ used to redirect user directory requests to external URLs.

- UserDir http://www.foo.com/users/*/ + UserDir http://example.org/users/*/

The above example will redirect a request for http://example.com/~bob/abc.html to - http://www.foo.com/users/bob/abc.html.

+ http://example.org/users/bob/abc.html.

diff --git a/docs/manual/misc/security_tips.xml b/docs/manual/misc/security_tips.xml index c833fad93ef..fcc3dac6874 100644 --- a/docs/manual/misc/security_tips.xml +++ b/docs/manual/misc/security_tips.xml @@ -317,7 +317,7 @@ the second example will list the ten last denied clients, for example:

- [Thu Jul 11 17:18:39 2002] [error] [client foo.bar.com] client denied + [Thu Jul 11 17:18:39 2002] [error] [client foo.example.com] client denied by server configuration: /usr/local/apache/htdocs/.htpasswd @@ -326,7 +326,7 @@ would have seen something similar to:

- foo.bar.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1" + foo.example.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1"

in your Access Log. This means diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index eb7d3b3e44d..3d2ec40e85c 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -1963,7 +1963,7 @@ URLs functionality is especially useful when combined with the SetHandler directive. For example, to enable status requests, but allow them - only from browsers at foo.com, you might use:

+ only from browsers at example.com, you might use:

<Location /status>
@@ -1971,7 +1971,7 @@ URLs SetHandler server-status
Order Deny,Allow
Deny from all
- Allow from .foo.com
+ Allow from .example.com
</Location> @@ -3313,11 +3313,11 @@ hostname or IP address Example <VirtualHost 10.1.2.3>
- ServerAdmin webmaster@host.foo.com
- DocumentRoot /www/docs/host.foo.com
- ServerName host.foo.com
- ErrorLog logs/host.foo.com-error_log
- TransferLog logs/host.foo.com-access_log
+ ServerAdmin webmaster@host.example.com
+ DocumentRoot /www/docs/host.example.com
+ ServerName host.example.com
+ ErrorLog logs/host.example.com-error_log
+ TransferLog logs/host.example.com-access_log
 </VirtualHost> diff --git a/docs/manual/mod/mod_imagemap.xml b/docs/manual/mod/mod_imagemap.xml index 9fcba6c2b1e..b65c8352363 100644 --- a/docs/manual/mod/mod_imagemap.xml +++ b/docs/manual/mod/mod_imagemap.xml @@ -218,14 +218,14 @@ generated:

- <a href="http://foo.com/">Menu text</a> + <a href="http://example.com/">Menu text</a>

If no quoted text is present, the name of the link will be used as the text:

- <a href="http://foo.com/">http://foo.com</a> + <a href="http://example.com/">http://example.com</a>

If you want to use double quotes within this text, you have to @@ -243,11 +243,11 @@ base referer
poly map "Could I have a menu, please?" 0,0 0,10 10,10 10,0
rect .. 0,0 77,27 "the directory of the referer"
- circle http://www.inetnebr.com/lincoln/feedback/ 195,0 305,27
+ circle http://www.inetnebr.example.com/lincoln/feedback/ 195,0 305,27
rect another_file "in same directory as referer" 306,0 419,27
- point http://www.zyzzyva.com/ 100,100
- point http://www.tripod.com/ 200,200
- rect mailto:nate@tripod.com 100,150 200,0 "Bugs?"
+ point http://www.zyzzyva.example.com/ 100,100
+ point http://www.tripod.example.com/ 200,200
+ rect mailto:nate@tripod.example.com 100,150 200,0 "Bugs?"

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 46047f4dcf0..3ca53ac4e8f 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -479,9 +479,9 @@ request this module.

Example - ProxyRemote http://goodguys.com/ http://mirrorguys.com:8000
- ProxyRemote * http://cleversite.com
- ProxyRemote ftp http://ftpproxy.mydomain.com:8080 + ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000
+ ProxyRemote * http://cleverproxy.localdomain
+ ProxyRemote ftp http://ftpproxy.mydomain:8080

In the last example, the proxy will forward FTP requests, encapsulated @@ -1162,8 +1162,8 @@ directly ProxyRemote proxy server(s).

Example - ProxyRemote * http://firewall.mycompany.com:81
- NoProxy .mycompany.com 192.168.112.0/21 + ProxyRemote * http://firewall.example.com:81
+ NoProxy .example.com 192.168.112.0/21

The host arguments to the NoProxy @@ -1190,8 +1190,8 @@ directly Note

Domain name comparisons are done without regard to the case, and Domains are always assumed to be anchored in the root of the - DNS tree, therefore two domains .MyDomain.com and - .mydomain.com. (note the trailing period) are considered + DNS tree, therefore two domains .ExAmple.com and + .example.com. (note the trailing period) are considered equal. Since a domain comparison does not involve a DNS lookup, it is much more efficient than subnet comparison.

@@ -1248,7 +1248,7 @@ directly of hosts with different IPAddrs).

Examples - prep.ai.mit.edu
+ prep.ai.example.com
www.apache.org @@ -1260,8 +1260,8 @@ directly link.

Hostname comparisons are done without regard to the case, and Hostnames are always assumed to be anchored in the root - of the DNS tree, therefore two hosts WWW.MyDomain.com - and www.mydomain.com. (note the trailing period) are + of the DNS tree, therefore two hosts WWW.ExAmple.com + and www.example.com. (note the trailing period) are considered equal.

@@ -1302,9 +1302,9 @@ directly will be generated.

Example - ProxyRemote * http://firewall.mycompany.com:81
- NoProxy .mycompany.com 192.168.112.0/21
- ProxyDomain .mycompany.com + ProxyRemote * http://firewall.example.com:81
+ NoProxy .example.com 192.168.112.0/21
+ ProxyDomain .example.com diff --git a/docs/manual/mod/mod_proxy_balancer.xml b/docs/manual/mod/mod_proxy_balancer.xml index bcd8a438d24..7644cd76359 100644 --- a/docs/manual/mod/mod_proxy_balancer.xml +++ b/docs/manual/mod/mod_proxy_balancer.xml @@ -338,7 +338,7 @@ candidate lbstatus -= total factor mod_status and mod_proxy_balancer have to be present in the server.

-

To enable load balancer management for browsers from the foo.com +

To enable load balancer management for browsers from the example.com domain add this code to your httpd.conf configuration file

@@ -347,7 +347,7 @@ candidate lbstatus -= total factor
Order Deny,Allow
Deny from all
- Allow from .foo.com
+ Allow from .example.com
</Location> diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml index db947bfa34e..306d3429191 100644 --- a/docs/manual/mod/mod_setenvif.xml +++ b/docs/manual/mod/mod_setenvif.xml @@ -218,7 +218,7 @@ of

SetEnvIf Request_URI "\.jpg$" object_is_image=jpg
SetEnvIf Request_URI "\.xbm$" object_is_image=xbm
:
- SetEnvIf Referer www\.mydomain\.com intra_site_referral
+ SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral
:
SetEnvIf object_is_image xbm XBIT_PROCESSING=1
:
@@ -229,7 +229,7 @@ of

object_is_image if the request was for an image file, and the fourth sets intra_site_referral if the referring page was somewhere on the - www.mydomain.com Web site.

+ www.mydomain.example.com Web site.

The last example will set environment variable HAVE_TS if the request contains any headers that diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml index 7aa546bd734..99c68412781 100644 --- a/docs/manual/mod/mod_status.xml +++ b/docs/manual/mod/mod_status.xml @@ -72,7 +72,7 @@ performance

Enabling Status Support -

To enable status reports only for browsers from the foo.com +

To enable status reports only for browsers from the example.com domain add this code to your httpd.conf configuration file

@@ -81,7 +81,7 @@ performance
Order Deny,Allow
Deny from all
- Allow from .foo.com
+ Allow from .example.com
</Location> diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml index 650a5593217..71989d0e2a2 100644 --- a/docs/manual/mod/mod_userdir.xml +++ b/docs/manual/mod/mod_userdir.xml @@ -81,7 +81,7 @@ host Userdir directive, the argument is treated as a filename pattern, and is used to turn the name into a directory specification. A request for - http://www.foo.com/~bob/one/two.html will be + http://www.example.com/~bob/one/two.html will be translated to:

@@ -97,11 +97,11 @@ host
- + +http://www.example.com/*/usr +http://www.example.com/~*/
UserDir directive used Translated path
UserDir http://www.foo.com/usershttp://www.foo.com/users/bob/one/two.html
UserDir http://www.example.com/usershttp://www.example.com/users/bob/one/two.html
UserDir -http://www.foo.com/*/usrhttp://www.foo.com/bob/usr/one/two.html
http://www.example.com/bob/usr/one/two.html
UserDir -http://www.foo.com/~*/http://www.foo.com/~bob/one/two.html
http://www.example.com/~bob/one/two.html
@@ -136,12 +136,12 @@ UserDir disabled user4 user5 user6

It is also possible to specify alternative user directories. If you use a command like:

-Userdir public_html /usr/web http://www.foo.com/ +Userdir public_html /usr/web http://www.example.com/ -

With a request for http://www.foo.com/~bob/one/two.html, will try to +

With a request for http://www.example.com/~bob/one/two.html, will try to find the page at ~bob/public_html/one/two.html first, then /usr/web/bob/one/two.html, and finally it will send a redirect -to http://www.foo.com/bob/one/two.html.

+to http://www.example.com/bob/one/two.html.

If you add a redirect, it must be the last alternative in the list. Apache cannot determine if the redirect succeeded or not, so if you have the redirect earlier in the list, that will always be the alternative diff --git a/docs/manual/mod/mod_usertrack.xml b/docs/manual/mod/mod_usertrack.xml index 6ea25a0cbc1..ac5512f120c 100644 --- a/docs/manual/mod/mod_usertrack.xml +++ b/docs/manual/mod/mod_usertrack.xml @@ -122,7 +122,7 @@ time late in the year "37".

The domain string must begin with a dot, and must include at least one embedded dot. That is, - .foo.com is legal, but foo.bar.com and + .example.com is legal, but foo.example.com and .com are not.

Most browsers in use today will not allow cookies to be set diff --git a/docs/manual/rewrite/rewrite_guide_advanced.xml b/docs/manual/rewrite/rewrite_guide_advanced.xml index 5ec11404299..81b026deb27 100644 --- a/docs/manual/rewrite/rewrite_guide_advanced.xml +++ b/docs/manual/rewrite/rewrite_guide_advanced.xml @@ -587,7 +587,7 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom

Suppose we want to load balance the traffic to - www.foo.com over www[0-5].foo.com + www.example.com over www[0-5].example.com (a total of 6 servers). How can this be done?

@@ -604,7 +604,7 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom

The simplest method for load-balancing is to use DNS round-robin. - Here you just configure www[0-9].foo.com + Here you just configure www[0-9].example.com as usual in your DNS with A (address) records, e.g.,

@@ -626,15 +626,15 @@ www   IN  A       1.2.3.4
 www   IN  A       1.2.3.5
-

Now when www.foo.com gets +

Now when www.example.com gets resolved, BIND gives out www0-www5 - but in a permutated (rotated) order every time. This way the clients are spread over the various servers. But notice that this is not a perfect load balancing scheme, because DNS resolutions are cached by clients and other nameservers, so - once a client has resolved www.foo.com - to a particular wwwN.foo.com, all its + once a client has resolved www.example.com + to a particular wwwN.example.com, all its subsequent requests will continue to go to the same IP (and thus a single server), rather than being distributed across the other available servers. But the @@ -661,15 +661,15 @@ www IN A 1.2.3.5

In this variant we use mod_rewrite and its proxy throughput feature. First we dedicate - www0.foo.com to be actually - www.foo.com by using a single

+ www0.example.com to be actually + www.example.com by using a single

-www    IN  CNAME   www0.foo.com.
+www    IN  CNAME   www0.example.com.

entry in the DNS. Then we convert - www0.foo.com to a proxy-only server, + www0.example.com to a proxy-only server, i.e., we configure this machine so all arriving URLs are simply passed through its internal proxy to one of the 5 other servers (www1-www5). To @@ -709,7 +709,7 @@ while (<STDIN>) { A last notice: Why is this useful? Seems like - www0.foo.com still is overloaded? The + www0.example.com still is overloaded? The answer is yes, it is overloaded, but with plain proxy throughput requests, only! All SSI, CGI, ePerl, etc. processing is handled done on the other machines.