From 0915887d2a15dc69a5f6ba6670e9b5ff0d253ff6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Tue, 26 Feb 2019 13:52:06 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1854379 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/faq/index.html.es.utf8 | 2 +- docs/manual/mod/core.html.de | 4 +- docs/manual/mod/core.html.en | 10 +-- docs/manual/mod/core.html.es.utf8 | 4 +- docs/manual/mod/core.html.ja.utf8 | 4 +- docs/manual/mod/core.html.tr.utf8 | 4 +- docs/manual/mod/directives.html.de | 2 +- docs/manual/mod/directives.html.en | 2 +- docs/manual/mod/directives.html.es.utf8 | 2 +- docs/manual/mod/directives.html.ja.utf8 | 2 +- docs/manual/mod/directives.html.ko.euc-kr | 2 +- docs/manual/mod/directives.html.tr.utf8 | 2 +- docs/manual/mod/directives.html.zh-cn.utf8 | 2 +- docs/manual/mod/mod_authnz_ldap.html.en | 22 +++---- docs/manual/mod/mod_deflate.html.en | 18 +++--- docs/manual/mod/mod_deflate.html.ja.utf8 | 6 +- docs/manual/mod/mod_deflate.html.ko.euc-kr | 6 +- docs/manual/mod/mod_reqtimeout.html.en | 63 ++++++++++--------- docs/manual/mod/mod_ssl.html.en | 6 +- docs/manual/mod/mod_ssl.html.es.utf8 | 43 ++++++------- docs/manual/mod/mpm_common.html.en | 8 +-- docs/manual/mod/overrides.html.en | 2 +- docs/manual/mod/quickreference.html.de | 32 +++++----- docs/manual/mod/quickreference.html.en | 18 +++--- docs/manual/mod/quickreference.html.es.utf8 | 32 +++++----- docs/manual/mod/quickreference.html.ja.utf8 | 32 +++++----- docs/manual/mod/quickreference.html.ko.euc-kr | 34 +++++----- docs/manual/mod/quickreference.html.tr.utf8 | 32 +++++----- .../manual/mod/quickreference.html.zh-cn.utf8 | 34 +++++----- 29 files changed, 225 insertions(+), 205 deletions(-) diff --git a/docs/manual/faq/index.html.es.utf8 b/docs/manual/faq/index.html.es.utf8 index 329ce40577..375f9a3272 100644 --- a/docs/manual/faq/index.html.es.utf8 +++ b/docs/manual/faq/index.html.es.utf8 @@ -32,7 +32,7 @@ -

Las preguntas frecuentes se han movido a la Wiki de HTTP Server (en Inglés).

+

Las preguntas frecuentes se han movido a la Wiki de HTTP Server (en Inglés).

diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 08a28471b0..fbd320a912 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -652,7 +652,7 @@ HTTP-Response-Headern - + @@ -663,7 +663,7 @@ HTTP-Response-Headern
top
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 4d88c442b0..35eccf570a 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -822,7 +822,7 @@ headers
Beschreibung:Base directory for the persistent state files
Syntax:DefaultStateDir directory-path
Voreinstellung:DefaultRuntimeDir DEFAULT_REL_STATEDIR (state/)
Voreinstellung:DefaultStateDir DEFAULT_REL_STATEDIR (state/)
Kontext:Serverkonfiguration
Status:Core
Modul:core
- + @@ -832,7 +832,7 @@ headers directory in which the server will create various persistent state files (databases, long-lived caches, etc.). If set as a relative path, the full path will be relative to - ServerRoot.

+ ServerRoot.

Example

DefaultStateDir state/
@@ -842,8 +842,8 @@ headers modified by changing the DEFAULT_REL_STATEDIR #define at build time.

-

Note: ServerRoot should be specified before this - directive is used. Otherwise, the default value of ServerRoot +

Note: ServerRoot should be specified before this + directive is used. Otherwise, the default value of ServerRoot would be used to set the base directory.

@@ -851,7 +851,7 @@ headers
top
diff --git a/docs/manual/mod/core.html.es.utf8 b/docs/manual/mod/core.html.es.utf8 index df4bf2e0f6..5b4a8e7c51 100644 --- a/docs/manual/mod/core.html.es.utf8 +++ b/docs/manual/mod/core.html.es.utf8 @@ -664,7 +664,7 @@ headers
Description:Base directory for the persistent state files
Syntax:DefaultStateDir directory-path
Default:DefaultRuntimeDir DEFAULT_REL_STATEDIR (state/)
Default:DefaultStateDir DEFAULT_REL_STATEDIR (state/)
Context:server config
Status:Core
Module:core
- + @@ -675,7 +675,7 @@ headers
top
diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index 05e2bb7e0b..03119040bd 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -622,7 +622,7 @@ variables
Descripción:Base directory for the persistent state files
Sintaxis:DefaultStateDir directory-path
Valor por defecto:DefaultRuntimeDir DEFAULT_REL_STATEDIR (state/)
Valor por defecto:DefaultStateDir DEFAULT_REL_STATEDIR (state/)
Contexto:server config
Estado:Core
Módulo:core
- + @@ -633,7 +633,7 @@ variables
top
diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index b7f233fcdb..c80d1fcdc6 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -798,7 +798,7 @@ nasıl ayarlanacağını öğrenmek için:
説明:Base directory for the persistent state files
構文:DefaultStateDir directory-path
デフォルト:DefaultRuntimeDir DEFAULT_REL_STATEDIR (state/)
デフォルト:DefaultStateDir DEFAULT_REL_STATEDIR (state/)
コンテキスト:サーバ設定ファイル
ステータス:Core
モジュール:core
- + @@ -808,7 +808,7 @@ nasıl ayarlanacağını öğrenmek için:
top
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index a5c128e47e..824e888d0d 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -137,7 +137,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 914655f6e6..3e730c9f14 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -138,7 +138,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/directives.html.es.utf8 b/docs/manual/mod/directives.html.es.utf8 index 6342ab935a..68b62bf260 100644 --- a/docs/manual/mod/directives.html.es.utf8 +++ b/docs/manual/mod/directives.html.es.utf8 @@ -140,7 +140,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index 501622d8b3..eee9d227ed 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -135,7 +135,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index e6f3411323..ecbbd7c782 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -135,7 +135,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index 5867c06b96..57f9b10bfa 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -134,7 +134,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8 index b6256e9e84..d9819aef4d 100644 --- a/docs/manual/mod/directives.html.zh-cn.utf8 +++ b/docs/manual/mod/directives.html.zh-cn.utf8 @@ -133,7 +133,7 @@
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL
  • AuthMerging
  • AuthName
  • AuthnCacheContext
    • diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index 7c88b0eaaf..faa6664c6f 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -94,7 +94,7 @@ for HTTP Basic authentication.
  • AuthLDAPSearchAsUser
  • AuthLDAPSubGroupAttribute
  • AuthLDAPSubGroupClass
    • -
  • AuthLDAPUrl
    • +
  • AuthLDAPURL

    • Bugfix checklist

    See also

    - + @@ -1034,7 +1034,7 @@ groups. check for user members within groups. Multiple attributes can be used by specifying this directive multiple times. If not specified, then mod_authnz_ldap uses the member and - uniquemember attributes.

    + uniqueMember attributes.

    top
    @@ -1195,7 +1195,7 @@ query to set the REMOTE_USER environment variable

    If this directive is set, the value of the REMOTE_USER environment variable will be set to the value of the attribute specified. Make sure that this attribute is - included in the list of attributes in the AuthLDAPUrl definition, + included in the list of attributes in the AuthLDAPURL definition, otherwise this directive will have no effect. This directive, if present, takes precedence over AuthLDAPRemoteUserIsDN. This directive is useful should you want people to log into a website @@ -1268,7 +1268,7 @@ environment variable directive line, used to distinguish the members of the current group that are groups.

    - + @@ -1313,10 +1313,10 @@ objects that are groups during sub-group processing.
    top
    -

    AuthLDAPUrl Directive

    +

    AuthLDAPURL Directive

    Açıklama:Base directory for the persistent state files
    Sözdizimi:DefaultStateDir directory-path
    Öntanımlı:DefaultRuntimeDir DEFAULT_REL_STATEDIR (state/)
    Öntanımlı:DefaultStateDir DEFAULT_REL_STATEDIR (state/)
    Bağlam:sunucu geneli
    Durum:Çekirdek
    Modül:core
    Description:LDAP attributes used to identify the user members of groups.
    Syntax:AuthLDAPGroupAttribute attribute
    Default:AuthLDAPGroupAttribute member uniquemember
    Default:AuthLDAPGroupAttribute member uniqueMember
    Context:directory, .htaccess
    Override:AuthConfig
    Status:Extension
    Syntax:AuthLDAPSubGroupAttribute attribute
    Default:AuthLDAPSubgroupAttribute member uniquemember
    Default:AuthLDAPSubGroupAttribute member uniqueMember
    Context:directory, .htaccess
    Override:AuthConfig
    Status:Extension
    - + @@ -1326,7 +1326,7 @@ objects that are groups during sub-group processing. to use. The syntax of the URL is

    ldap://host:port/basedn?attribute?scope?filter

    If you want to specify more than one LDAP URL that Apache should try in turn, the syntax is:

    -
    AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."
    +
    AuthLDAPURL "ldap://ldap1.example.com ldap2.example.com/dc=..."

    Caveat: If you specify multiple servers, you need to enclose the entire URL string in quotes; otherwise you will get an error: "AuthLDAPURL takes one argument, URL to define LDAP connection.." @@ -1431,7 +1431,7 @@ You can of course use search parameters on each of these.

    upgraded to a secure connection on the same port. -

    See above for examples of AuthLDAPUrl URLs.

    +

    See above for examples of AuthLDAPURL URLs.

    diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en index 17f3854dd9..211529624b 100644 --- a/docs/manual/mod/mod_deflate.html.en +++ b/docs/manual/mod/mod_deflate.html.en @@ -318,10 +318,10 @@ contentaccess log.

    -

    Example

          DeflateFilterNote ratio
+    
    Example
    DeflateFilterNote ratio
 
-      LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate
-      CustomLog "logs/deflate_log" deflate
    
+LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate
+CustomLog "logs/deflate_log" deflate

    If you want to extract more accurate values from your logs, you @@ -380,7 +380,7 @@ CustomLog "logs/deflate_log" deflate

    - + @@ -389,8 +389,8 @@ CustomLog "logs/deflate_log" deflate
    Description:URL specifying the LDAP search parameters
    Syntax:AuthLDAPUrl url [NONE|SSL|TLS|STARTTLS]
    Syntax:AuthLDAPURL url [NONE|SSL|TLS|STARTTLS]
    Context:directory, .htaccess
    Override:AuthConfig
    Status:Extension
    Description:Maximum number of times the inflation ratio for request bodies can be crossed
    Syntax:DeflateInflateRatioBurst value
    Default:3
    Default:DeflateInflateRatioBurst 3
    Context:server config, virtual host, directory, .htaccess
    Override:All
    Status:Extension

    The DeflateInflateRatioBurst directive specifies the maximum number of times the - DeflateInflateRatioLimit can be crossed before - terminating the request.

    + DeflateInflateRatioLimit can + be crossed before terminating the request.

    top
    @@ -398,7 +398,7 @@ CustomLog "logs/deflate_log" deflate - + @@ -409,8 +409,8 @@ CustomLog "logs/deflate_log" deflate specifies the maximum ratio of deflated to inflated size of an inflated request body. This ratio is checked as the body is streamed in, and if crossed more than - DeflateInflateRatioBurst times, the request - will be terminated.

    + DeflateInflateRatioBurst + times, the request will be terminated.

    top
    diff --git a/docs/manual/mod/mod_deflate.html.ja.utf8 b/docs/manual/mod/mod_deflate.html.ja.utf8 index 89056b6998..e453030b19 100644 --- a/docs/manual/mod/mod_deflate.html.ja.utf8 +++ b/docs/manual/mod/mod_deflate.html.ja.utf8 @@ -363,7 +363,7 @@

    DeflateInflateLimitRequestBody ディレクティブ

    Description:Maximum inflation ratio for request bodies
    Syntax:DeflateInflateRatioLimit value
    Default:200
    Default:DeflateInflateRatioLimit 200
    Context:server config, virtual host, directory, .htaccess
    Override:All
    Status:Extension
    - + @@ -379,7 +379,7 @@ - + @@ -393,7 +393,7 @@
    説明:Maximum size of inflated request bodies
    構文:DeflateInflateLimitRequestBodyvalue
    構文:DeflateInflateLimitRequestBody value
    デフォルト:None, but LimitRequestBody applies after deflation
    コンテキスト:サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess
    上書き:All
    説明:Maximum number of times the inflation ratio for request bodies can be crossed
    構文:DeflateInflateRatioBurst value
    デフォルト:3
    デフォルト:DeflateInflateRatioBurst 3
    コンテキスト:サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess
    上書き:All
    ステータス:Extension
    - + diff --git a/docs/manual/mod/mod_deflate.html.ko.euc-kr b/docs/manual/mod/mod_deflate.html.ko.euc-kr index a33b1a3fe2..f4987962f1 100644 --- a/docs/manual/mod/mod_deflate.html.ko.euc-kr +++ b/docs/manual/mod/mod_deflate.html.ko.euc-kr @@ -353,7 +353,7 @@

    DeflateInflateLimitRequestBody Áö½Ã¾î

    説明:Maximum inflation ratio for request bodies
    構文:DeflateInflateRatioLimit value
    デフォルト:200
    デフォルト:DeflateInflateRatioLimit 200
    コンテキスト:サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess
    上書き:All
    ステータス:Extension
    - + @@ -369,7 +369,7 @@ - + @@ -383,7 +383,7 @@
    ¼³¸í:Maximum size of inflated request bodies
    ¹®¹ý:DeflateInflateLimitRequestBodyvalue
    ¹®¹ý:DeflateInflateLimitRequestBody value
    ±âº»°ª:None, but LimitRequestBody applies after deflation
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess
    Override ¿É¼Ç:All
    ¼³¸í:Maximum number of times the inflation ratio for request bodies can be crossed
    ¹®¹ý:DeflateInflateRatioBurst value
    ±âº»°ª:3
    ±âº»°ª:DeflateInflateRatioBurst 3
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess
    Override ¿É¼Ç:All
    »óÅÂ:Extension
    - + diff --git a/docs/manual/mod/mod_reqtimeout.html.en b/docs/manual/mod/mod_reqtimeout.html.en index 091ba1de29..f67b95887f 100644 --- a/docs/manual/mod/mod_reqtimeout.html.en +++ b/docs/manual/mod/mod_reqtimeout.html.en @@ -64,10 +64,11 @@
    1. - Allow 10 seconds to receive the request including the headers and - 30 seconds for receiving the request body: + Allow for 5 seconds to complete the TLS handshake, 10 seconds to + receive the request headers and 30 seconds for receiving the + request body: - 
      RequestReadTimeout header=10 body=30
      + 
      RequestReadTimeout handshake=5 header=10 body=30
      2. @@ -83,10 +84,10 @@
    2. - Allow at least 10 seconds to receive the request including the headers. + Allow at least 10 seconds to receive the request headers. If the client sends data, increase the timeout by 1 second for every 500 bytes received. But do not allow more than 30 seconds for the - request including the headers: + request headers: 
      RequestReadTimeout header=10-30,MinRate=500
      @@ -106,65 +107,69 @@
      top

      RequestReadTimeout Directive

    ¼³¸í:Maximum inflation ratio for request bodies
    ¹®¹ý:DeflateInflateRatioLimit value
    ±âº»°ª:200
    ±âº»°ª:DeflateInflateRatioLimit 200
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess
    Override ¿É¼Ç:All
    »óÅÂ:Extension
    - - + - +
    Description:Set timeout values for receiving request headers and body from client. +
    Description:Set timeout values for completing the TLS handshake, receiving +the request headers and/or body from client.
    Syntax:RequestReadTimeout +[handshake=timeout[-maxtimeout][,MinRate=rate] [header=timeout[-maxtimeout][,MinRate=rate] [body=timeout[-maxtimeout][,MinRate=rate]
    Default:header=20-40,MinRate=500 body=20,MinRate=500
    Default:RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500
    Context:server config, virtual host
    Status:Extension
    Module:mod_reqtimeout
    Compatibility:Defaulted to disabled in -version 2.3.14 and earlier.
    Compatibility:Defaulted to disabled in version 2.3.14 and earlier. The +handshake stage is available since version 2.5. +
    -

    This directive can set various timeouts for receiving the request headers - and the request body from the client. If the client fails to send headers or - body within the configured time, a 408 REQUEST TIME OUT error - is sent.

    +

    This directive can set various timeouts for completing the TLS handshake, + receiving the request headers and/or the request body from the client. + If the client fails to complete each of these stages within the configured + time, a 408 REQUEST TIME OUT error is sent.

    -

    For SSL virtual hosts, the header timeout values include the time needed - to do the initial SSL handshake. If the user's browser is configured to +

    For SSL virtual hosts, the handshake timeout values is the time + needed to do the initial SSL handshake. If the user's browser is configured to query certificate revocation lists and the CRL server is not reachable, the initial SSL handshake may take a significant time until the browser gives up - waiting for the CRL. Therefore the header timeout values should not be set - to very low values for SSL virtual hosts. + waiting for the CRL. Therefore the handshake timeout should take + this possible overhead into consideration for SSL virtual hosts (if necessary). The body timeout values include the time needed for SSL renegotiation (if necessary).

    When an AcceptFilter is in use (usually the case on Linux and FreeBSD), the socket is not sent to the server process before at least one byte (or the whole request for - httpready) is received. The header timeout configured with - RequestReadTimeout is only effective after the server process has - received the socket.

    + httpready) is received. The handshake and header timeouts + configured with RequestReadTimeout are only effective + after the server process has received the socket.

    -

    For each of the two timeout types (header or body), there are three ways - to specify the timeout: +

    For each of the three timeout stages (handshake, header or body), there are + three ways to specify the timeout:

    -

    Puede comprobar una descripciónm detallada de todas las políticas definidas +

    Puede comprobar una descripción detallada de todas las políticas definidas a través de la línea de comandos:

    Listar Todas las Políticas Definidas

    httpd -t -D DUMP_SSL_POLICIES

    Una SSLPolicy define la línea base para el contexto en la que se utiliza. Eso -significa que cualquier otra diretiva SSL en el mismo contexto la sobreescribirá. +significa que cualquier otra directiva SSL en el mismo contexto la sobrescribirá. Como ejemplo de esto, vea el valor efectivo de SSLProtocol en la siguiente configuración:

    @@ -1618,7 +1618,7 @@ SSLProtocol all

    Puede haber más de una política aplicada en un contexto. La últimas -sobreescribiendo las previas: :

    +sobrescribiendo las previas: :

    Ordenando Políticas

    <VirtualHost...> # protocolo efectivo: 'all -SSLv3'
    SSLPolicy modern
@@ -1651,8 +1651,8 @@ Los protocolos disponibles (no sensibles a mayúsculas) son: