From 5f8b9acc032f08b6cd71c533eeddd10bcaa79f61 Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Wed, 9 Sep 2015 14:03:28 +0000 Subject: [PATCH] Rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1702017 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.de | 3 ++- docs/manual/mod/core.html.en | 27 ++++++++++--------- docs/manual/mod/core.html.es | 3 ++- docs/manual/mod/core.html.fr | 2 ++ docs/manual/mod/core.html.ja.utf8 | 3 ++- docs/manual/mod/core.html.tr.utf8 | 3 ++- docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.meta | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/mod_authz_host.html.en | 4 ++- docs/manual/mod/mod_authz_host.html.fr | 2 ++ docs/manual/mod/mod_authz_host.xml.fr | 2 +- docs/manual/mod/mod_authz_host.xml.meta | 2 +- docs/manual/mod/mod_info.html.en | 6 ++--- docs/manual/mod/mod_info.html.fr | 2 ++ docs/manual/mod/mod_info.xml.fr | 2 +- docs/manual/mod/mod_info.xml.ja | 2 +- docs/manual/mod/mod_info.xml.ko | 2 +- docs/manual/mod/mod_info.xml.meta | 2 +- docs/manual/mod/mod_lua.html.fr | 2 ++ docs/manual/mod/mod_proxy.html.en | 6 ----- docs/manual/mod/mod_proxy.html.fr | 2 ++ docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/quickreference.html.de | 4 +-- docs/manual/mod/quickreference.html.en | 4 +-- docs/manual/mod/quickreference.html.es | 4 +-- docs/manual/mod/quickreference.html.ja.utf8 | 4 +-- docs/manual/mod/quickreference.html.ko.euc-kr | 4 +-- docs/manual/mod/quickreference.html.tr.utf8 | 4 +-- .../manual/mod/quickreference.html.zh-cn.utf8 | 4 +-- 35 files changed, 68 insertions(+), 55 deletions(-) diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 17b6fc8ece..50387b5db5 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -2753,6 +2753,7 @@ bestimmten Verzeichnis verf + @@ -2769,7 +2770,7 @@ bestimmten Verzeichnis verf
Beschreibung:Protocols available for a server/virtual host
Syntax:Protocols protocol ...
Voreinstellung:Protocols http/1.1
Kontext:Serverkonfiguration, Virtual Host
Status:Core
Modul:core
- + diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 99fd03326d..003aedebf8 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -3671,6 +3671,7 @@ directory
Beschreibung:Protocols available for a server/virtual host
Syntax:ProtocolsHonorOrder On|Off
Voreinstellung:ProtocolsHonorOrder Off
Voreinstellung:ProtocolsHonorOrder On
Kontext:Serverkonfiguration, Virtual Host
Status:Core
Modul:core
+ @@ -3680,14 +3681,15 @@ directory server/virtual host. The list determines the allowed protocols a client may negotiate for this server/host.

-

You only need to set protocols if you want to limit the available - protocols for a server/host. By default, all supported protocols - are available to a client.

+

You need to set protocols if you want to extend the available + protocols for a server/host. By default, only the http/1.1 protocol + (which includes the compatibility with 1.0 and 0.9 clients) is + allowed.

-

For example, if you want to support only HTTP/1.1 for a server, even - though HTTP/2 is available, just specify this protocol only:

+

For example, if you want to support HTTP/2 for a server with TLS, + specify:

-
Protocols http/1.1
+
Protocols h2 http/1.1

Valid protocols are http/1.1 for http and https connections, @@ -3714,7 +3716,7 @@ directory

Description:Protocols available for a server/virtual host
Syntax:Protocols protocol ...
Default:Protocols http/1.1
Context:server config, virtual host
Status:Core
Module:core
- + @@ -3723,12 +3725,13 @@ directory

This directive specifies if the server should honor the order in which the Protocols directive lists protocols.

-

By default, a client supplies a list of supported protocols and the server - selects an available one from that list in the given order.

+

If configured Off, the client supplied list order of protocols has + precedence over the order in the server configuration.

-

With ProtocolsHonorOrder set to on, the - client ordering does not matter and only the ordering in the server - settings influences the outcome of the protocol negotiation.

+

With ProtocolsHonorOrder set to on + (default), the client ordering does not matter and only the ordering + in the server settings influences the outcome of the protocol + negotiation.

See also

diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index 13ab1f81bc..3af5f4a085 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -3399,6 +3399,7 @@ On Windows from Apache 2.3.3 and later.
Description:Protocols available for a server/virtual host
Syntax:ProtocolsHonorOrder On|Off
Default:ProtocolsHonorOrder Off
Default:ProtocolsHonorOrder On
Context:server config, virtual host
Status:Core
Module:core
+ @@ -3415,7 +3416,7 @@ On Windows from Apache 2.3.3 and later.
Descripción:Protocols available for a server/virtual host
Sintaxis:Protocols protocol ...
Valor por defecto:Protocols http/1.1
Contexto:server config, virtual host
Estado:Core
Módulo:core
- + diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index 3b1c4d4ab6..474b603b11 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -33,6 +33,8 @@  ja  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
Descripción:Protocols available for a server/virtual host
Sintaxis:ProtocolsHonorOrder On|Off
Valor por defecto:ProtocolsHonorOrder Off
Valor por defecto:ProtocolsHonorOrder On
Contexto:server config, virtual host
Estado:Core
Módulo:core
Description:Fonctionnalités de base du serveur HTTP Apache toujours disponibles
Statut:Core
diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index d223364be2..ca08f8b4aa 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -2695,6 +2695,7 @@ or specified mutexes + @@ -2711,7 +2712,7 @@ or specified mutexes
説明:Protocols available for a server/virtual host
構文:Protocols protocol ...
デフォルト:Protocols http/1.1
コンテキスト:サーバ設定ファイル, バーチャルホスト
ステータス:Core
モジュール:core
- + diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index 7e744f0a78..d611feb9fa 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -3553,6 +3553,7 @@ uygulanır.
説明:Protocols available for a server/virtual host
構文:ProtocolsHonorOrder On|Off
デフォルト:ProtocolsHonorOrder Off
デフォルト:ProtocolsHonorOrder On
コンテキスト:サーバ設定ファイル, バーチャルホスト
ステータス:Core
モジュール:core
+ @@ -3568,7 +3569,7 @@ uygulanır.
Açıklama:Protocols available for a server/virtual host
Sözdizimi:Protocols protocol ...
Öntanımlı:Protocols http/1.1
Bağlam:sunucu geneli, sanal konak
Durum:Çekirdek
Modül:core
- + diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 8735c9d3a0..52b0ecf701 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 599d8a02c5..10cad9e126 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_authz_host.xml.meta b/docs/manual/mod/mod_authz_host.xml.meta index 2df68a979b..c67d019aa9 100644 --- a/docs/manual/mod/mod_authz_host.xml.meta +++ b/docs/manual/mod/mod_authz_host.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index 47acd3ebf1..9f26fda2d1 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -91,11 +91,11 @@ configuration

Access control

<Location "/server-info">
     SetHandler server-info
-    Order allow,deny
     # Allow access from server itself
-    Allow from 127.0.0.1
+    Require ip 127.0.0.1
+
     # Additionally, allow access from local workstation
-    Allow from 192.168.1.17
+    Require ip 192.168.1.17
 </Location>
top
diff --git a/docs/manual/mod/mod_info.html.fr b/docs/manual/mod/mod_info.html.fr index 8b8ba7631e..8cb99a0939 100644 --- a/docs/manual/mod/mod_info.html.fr +++ b/docs/manual/mod/mod_info.html.fr @@ -31,6 +31,8 @@  ja  |  ko 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
Açıklama:Protocols available for a server/virtual host
Sözdizimi:ProtocolsHonorOrder On|Off
Öntanımlı:ProtocolsHonorOrder Off
Öntanımlı:ProtocolsHonorOrder On
Bağlam:sunucu geneli, sanal konak
Durum:Çekirdek
Modül:core
diff --git a/docs/manual/mod/mod_info.xml.fr b/docs/manual/mod/mod_info.xml.fr index 3614513f99..76b2b7d089 100644 --- a/docs/manual/mod/mod_info.xml.fr +++ b/docs/manual/mod/mod_info.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja index c9f1f01cc9..59e2cd037b 100644 --- a/docs/manual/mod/mod_info.xml.ja +++ b/docs/manual/mod/mod_info.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 6628e5c243..644d6d61c9 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +
Description:Affiche une présentation complète de la configuration du serveur
Statut:Extension