From 6c15fb07ea6c8e8e1d50f67f4608dde6f87f7ad1 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 7 Dec 2010 16:53:56 +0000 Subject: [PATCH] generated files git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1043127 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_access_compat.html.en | 26 +++++++++++------------ docs/manual/mod/mod_access_compat.xml.ja | 2 +- docs/manual/mod/mod_authz_host.html.en | 6 +++--- docs/manual/mod/mod_cache.html.en | 12 +++++------ docs/manual/mod/mod_cache.xml.ja | 2 +- docs/manual/mod/mod_cache.xml.ko | 2 +- docs/manual/mod/mod_proxy.html.en | 6 +++--- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_setenvif.html.en | 6 +++--- docs/manual/mod/mod_setenvif.xml.ja | 2 +- docs/manual/mod/mod_setenvif.xml.ko | 2 +- docs/manual/mod/mod_setenvif.xml.tr | 2 +- docs/manual/platform/windows.html.en | 6 +++--- docs/manual/platform/windows.xml.ko | 2 +- docs/manual/rewrite/flags.html.en | 4 ++-- docs/manual/upgrading.html.en | 6 +++--- docs/manual/upgrading.xml.fr | 2 +- docs/manual/vhosts/examples.html.en | 6 +++--- docs/manual/vhosts/examples.xml.fr | 2 +- docs/manual/vhosts/examples.xml.ja | 2 +- docs/manual/vhosts/examples.xml.ko | 2 +- docs/manual/vhosts/examples.xml.tr | 2 +- docs/manual/vhosts/ip-based.html.en | 20 ++++++++--------- docs/manual/vhosts/ip-based.xml.fr | 2 +- docs/manual/vhosts/ip-based.xml.ja | 2 +- docs/manual/vhosts/ip-based.xml.ko | 2 +- docs/manual/vhosts/ip-based.xml.tr | 2 +- docs/manual/vhosts/mass.html.en | 24 ++++++++++----------- docs/manual/vhosts/mass.xml.ko | 2 +- docs/manual/vhosts/mass.xml.tr | 2 +- 30 files changed, 80 insertions(+), 80 deletions(-) diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en index 00ff671960..26abe5d90d 100644 --- a/docs/manual/mod/mod_access_compat.html.en +++ b/docs/manual/mod/mod_access_compat.html.en @@ -114,13 +114,13 @@ server

Example:

- Allow from apache.org
+ Allow from example.org
Allow from .net example.edu

Hosts whose names match, or end in, this string are allowed access. Only complete components are matched, so the above - example will match foo.apache.org but it will not - match fooapache.org. This configuration will cause + example will match foo.example.org but it will not + match fooexample.org. This configuration will cause Apache httpd to perform a double DNS lookup on the client IP address, regardless of the setting of the HostnameLookups directive. It will do a reverse DNS lookup on the IP address to find the associated @@ -315,35 +315,35 @@ evaluated. -

In the following example, all hosts in the apache.org domain +

In the following example, all hosts in the example.org domain are allowed access; all other hosts are denied access.

Order Deny,Allow
Deny from all
- Allow from apache.org + Allow from example.org

-

In the next example, all hosts in the apache.org domain are +

In the next example, all hosts in the example.org domain are allowed access, except for the hosts which are in the - foo.apache.org subdomain, who are denied access. All hosts not - in the apache.org domain are denied access because the default + foo.example.org subdomain, who are denied access. All hosts not + in the example.org domain are denied access because the default state is to Deny access to the server.

Order Allow,Deny
- Allow from apache.org
- Deny from foo.apache.org + Allow from example.org
+ Deny from foo.example.org

On the other hand, if the Order in the last example is changed to Deny,Allow, all hosts will be allowed access. This happens because, regardless of the actual ordering of the directives in the configuration file, the - Allow from apache.org will be evaluated last and will - override the Deny from foo.apache.org. All hosts not in - the apache.org domain will also be allowed access + Allow from example.org will be evaluated last and will + override the Deny from foo.example.org. All hosts not in + the example.org domain will also be allowed access because the default state is Allow.

The presence of an Order directive can diff --git a/docs/manual/mod/mod_access_compat.xml.ja b/docs/manual/mod/mod_access_compat.xml.ja index d7979ddf9b..b6b1ad5108 100644 --- a/docs/manual/mod/mod_access_compat.xml.ja +++ b/docs/manual/mod/mod_access_compat.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + - + + diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja index e5eacd6a01..641444f75a 100644 --- a/docs/manual/vhosts/examples.xml.ja +++ b/docs/manual/vhosts/examples.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + +