From 6c70256c67c09a8ce8269ad2e6e40e21c6a28437 Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Wed, 1 Dec 2010 14:56:17 +0000 Subject: [PATCH] Rebuild igalic's changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1041032 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/dns-caveats.html.en | 18 +++---- docs/manual/dns-caveats.xml.ja | 2 +- docs/manual/dns-caveats.xml.ko | 2 +- docs/manual/dns-caveats.xml.tr | 2 +- docs/manual/howto/ssi.html.ja.utf8 | 2 + docs/manual/howto/ssi.html.ko.euc-kr | 2 + docs/manual/install.html.en | 2 +- docs/manual/install.html.fr | 2 + docs/manual/install.xml.de | 2 +- docs/manual/install.xml.es | 2 +- docs/manual/install.xml.fr | 2 +- docs/manual/install.xml.ja | 2 +- docs/manual/install.xml.ko | 2 +- docs/manual/install.xml.meta | 2 +- docs/manual/install.xml.tr | 2 +- docs/manual/misc/security_tips.html.en | 2 +- docs/manual/misc/security_tips.html.fr | 2 +- docs/manual/misc/security_tips.html.ko.euc-kr | 2 +- docs/manual/misc/security_tips.html.tr.utf8 | 2 +- docs/manual/misc/security_tips.xml.ko | 2 +- docs/manual/misc/security_tips.xml.tr | 2 +- docs/manual/mod/allmodules.xml.es | 2 +- docs/manual/mod/core.html | 4 ++ docs/manual/mod/core.html.de | 26 +++++----- docs/manual/mod/core.html.en | 48 ++++++++++++++++--- docs/manual/mod/core.html.fr | 2 + docs/manual/mod/core.html.ja.utf8 | 2 + docs/manual/mod/core.html.tr.utf8 | 2 + docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.meta | 1 + docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/index.html.es | 3 +- docs/manual/mod/mod_cgi.html.en | 4 +- docs/manual/mod/mod_cgi.xml.ja | 2 +- docs/manual/mod/mod_cgi.xml.ko | 2 +- docs/manual/mod/mod_isapi.html.en | 7 ++- docs/manual/mod/mod_isapi.xml.ko | 2 +- docs/manual/mod/mod_mime.html.en | 26 +++++----- docs/manual/mod/mod_mime.xml.ja | 2 +- docs/manual/mod/mod_suexec.html.en | 4 +- docs/manual/mod/mod_suexec.xml.ja | 2 +- docs/manual/mod/mod_suexec.xml.ko | 2 +- docs/manual/mod/mod_suexec.xml.tr | 2 +- docs/manual/mod/quickreference.html.es | 4 +- docs/manual/platform/ebcdic.html.en | 4 +- docs/manual/platform/ebcdic.xml.ko | 2 +- docs/manual/sections.html.en | 2 +- docs/manual/sections.xml.fr | 2 +- docs/manual/sections.xml.ja | 2 +- docs/manual/sections.xml.ko | 2 +- docs/manual/sections.xml.tr | 2 +- 52 files changed, 140 insertions(+), 89 deletions(-) diff --git a/docs/manual/dns-caveats.html.en b/docs/manual/dns-caveats.html.en index 596a5c5fda..d3dcfaccc0 100644 --- a/docs/manual/dns-caveats.html.en +++ b/docs/manual/dns-caveats.html.en @@ -117,18 +117,18 @@

Suppose that you've assigned 192.0.2.1 to www.example1.dom and 192.0.2.2 to www.example2.dom. Furthermore, suppose that - example2.dom has control of their own DNS. With this - config you have put example2.dom into a position where - they can steal all traffic destined to example1.dom. To - do so, all they have to do is set www.example2.dom to - 192.0.2.1. Since they control their own DNS you can't stop them - from pointing the www.example2.dom record wherever they + example1.dom has control of their own DNS. With this + config you have put example1.dom into a position where + they can steal all traffic destined to example2.dom. To + do so, all they have to do is set www.example1.dom to + 192.0.2.2. Since they control their own DNS you can't stop them + from pointing the www.example1.dom record wherever they wish.

-

Requests coming in to 192.0.2.1 (including all those where +

Requests coming in to 192.0.2.2 (including all those where users typed in URLs of the form - http://www.example1.dom/whatever) will all be served by - the example2.dom virtual host. To better understand why + http://www.example2.dom/whatever) will all be served by + the example1.dom virtual host. To better understand why this happens requires a more in-depth discussion of how httpd matches up incoming requests with the virtual host that will serve it. A rough document describing this is available.

diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja index eaefdf8af1..228879aa79 100644 --- a/docs/manual/dns-caveats.xml.ja +++ b/docs/manual/dns-caveats.xml.ja @@ -1,7 +1,7 @@ - + + + + + - + + + + + + - core.xml + core.xml.es mod_access_compat.xml mod_actions.xml mod_alias.xml diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index 81c99a4462..1dad1c3ee1 100644 --- a/docs/manual/mod/core.html +++ b/docs/manual/mod/core.html @@ -8,6 +8,10 @@ URI: core.html.en Content-Language: en Content-type: text/html; charset=ISO-8859-1 +URI: core.html.es +Content-Language: es +Content-type: text/html; charset=ISO-8859-1 + URI: core.html.fr Content-Language: fr Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 48ba80f0b4..83e75fe57d 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -23,6 +23,7 @@

Verfügbare Sprachen:  de  |  en  | + es  |  fr  |  ja  |  tr 

@@ -121,7 +122,7 @@ Servers Kontext:Serverkonfiguration Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

AcceptPathInfo-Direktive

@@ -1034,7 +1035,7 @@ Dateien an den Client auszuliefern Kontext:Serverkonfiguration, Virtual Host, Verzeichnis, .htaccess Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

ErrorDocument-Direktive

@@ -1213,7 +1214,7 @@ Fehlermeldungen Kontext:Serverkonfiguration, Virtual Host Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

ExtendedStatus-Direktive

@@ -1224,7 +1225,7 @@ request Kontext:Serverkonfiguration Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

FileETag-Direktive

@@ -1425,7 +1426,7 @@ angegebenen MIME-Content-Type Kontext:Serverkonfiguration, Virtual Host Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

HostnameLookups-Direktive

@@ -1480,7 +1481,7 @@ satisfied by a request at runtime Kontext:Serverkonfiguration, Virtual Host, Verzeichnis, .htaccess Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

<IfDefine>-Direktive

@@ -2338,7 +2339,7 @@ or specified mutexes Kontext:Serverkonfiguration Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

NameVirtualHost-Direktive

@@ -2572,7 +2573,7 @@ bestimmten Verzeichnis verf Kontext:Serverkonfiguration, Virtual Host Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

Require-Direktive

@@ -2877,7 +2878,7 @@ of a request or the last 63, assuming the request itself is greater than Kontext:Serverkonfiguration Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

ServerAdmin-Direktive

@@ -3295,7 +3296,7 @@ bevor er die Anfrage abbricht Kontext:Serverkonfiguration Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

UnDefine-Direktive

@@ -3305,7 +3306,7 @@ bevor er die Anfrage abbricht Kontext:Serverkonfiguration Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

UseCanonicalName-Direktive

@@ -3385,7 +3386,7 @@ ermittelt Kontext:Serverkonfiguration, Virtual Host, Verzeichnis Status:Core Modul:core -Documentation not yet translated. Please see English version of document. +

Documentation not yet translated. Please see English version of document.

top

<VirtualHost>-Direktive

@@ -3512,6 +3513,7 @@ IP-Adressen angewendet werden

Verfügbare Sprachen:  de  |  en  | + es  |  fr  |  ja  |  tr 

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index c9bd5b3a0b..a9da73b123 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -23,6 +23,7 @@

Available Languages:  de  |  en  | + es  |  fr  |  ja  |  tr 

@@ -116,11 +117,11 @@ available Compatibility:Available in Apache httpd 2.1.5 and later. On Windows from Apache httpd 2.3.3 and later. -

This directive enables operating system specific optimizations for a - listening socket by the Protocol type. The basic premise is for the - kernel to not send a socket to the server process until either data - is received or an entire HTTP Request is buffered. Only - +

This directive enables operating system specific optimizations for a + listening socket by the Protocoltype. + The basic premise is for the kernel to not send a socket to the server + process until either data is received or an entire HTTP Request is buffered. + Only FreeBSD's Accept Filters, Linux's more primitive TCP_DEFER_ACCEPT, and Windows' optimized AcceptEx() are currently supported.

@@ -180,7 +181,7 @@ On Windows from Apache httpd 2.3.3 and later. the connect option does not wait for the initial data transmission.

-

On Windows, none uses accept() rather than than AcceptEx() +

On Windows, none uses accept() rather than AcceptEx() and will not recycle sockets between connections. This is useful for network adapters with broken driver support, as well as some virtual network providers such as vpn drivers, or spam, virus or spyware @@ -1129,7 +1130,7 @@ in case of an error anyone other than the user that starts the server.

Note

When entering a file path on non-Unix platforms, care should be taken - to make sure that only forward slashed are used even though the platform + to make sure that only forward slashes are used even though the platform may allow the use of back slashes. In general it is a good idea to always use forward slashes throughout the configuration files.

@@ -2295,6 +2296,38 @@ URLs locations. Since several different URLs may map to the same filesystem location, such access controls may by circumvented.

+

The enclosed directives will be applied to the request if the path component + of the URL meets any of the following criteria: +

+
    +
  • The specified location matches exactly the path component of the URL. +
    • +
  • The specified location, which ends in a forward slash, is a prefix + of the path component of the URL (treated as a context root). +
    • +
  • The specified location, with the addition of a trailing slash, is a + prefix of the path component of the URL (also treated as a context root). +
    • +
+

+ In the example below, where no trailing slash is used, requests to + /private1, /private1/ and /private1/file.txt will have the enclosed + directives applied, but /private1other would not. +

+

+ <Location /private1> + ... +

+

+ In the example below, where a trailing slash is used, requests to + /private2/ and /private2/file.txt will have the enclosed + directives applied, but /private2 and /private2other would not. +

+

+ <Location /private2/> + ... +

+

When to use <Location>

Use <Location> to apply @@ -4093,6 +4126,7 @@ hostname or IP address

Available Languages:  de  |  en  | + es  |  fr  |  ja  |  tr 

diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index d170fff7e7..fc0aa5c9da 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -23,6 +23,7 @@

Langues Disponibles:  de  |  en  | + es  |  fr  |  ja  |  tr 

@@ -4390,6 +4391,7 @@ entre elles

Langues Disponibles:  de  |  en  | + es  |  fr  |  ja  |  tr 

diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index d7d63bb46f..89b571f697 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -24,6 +24,7 @@

言語:  de  |  en  | + es  |  fr  |  ja  |  tr 

@@ -3283,6 +3284,7 @@

言語:  de  |  en  | + es  |  fr  |  ja  |  tr 

diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index 2a13645190..70d881cb94 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -23,6 +23,7 @@

Mevcut Diller:  de  |  en  | + es  |  fr  |  ja  |  tr 

@@ -3310,6 +3311,7 @@ gerçekleşmesi için sunucunun geçmesini bekleyeceği süre.

Mevcut Diller:  de  |  en  | + es  |  fr  |  ja  |  tr 

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index cf0fa0376a..d861872c1b 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + + + + + + + + + - + + + +