From: Rich Bowen Date: Mon, 28 Dec 2015 17:56:13 +0000 (+0000) Subject: rebuild X-Git-Tag: 2.5.0-alpha~2495 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2098e6a43bbe2303e437d413cb8ec68762bf6c6;p=thirdparty%2Fapache%2Fhttpd.git rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1721961 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index 086efb2a230..c97ef3d0586 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -300,10 +300,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -314,6 +316,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 274107fc697..399bfea01e7 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -301,10 +301,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -315,6 +317,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index 2da43f69da2..219923c5672 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -303,10 +303,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -317,6 +319,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.fr b/docs/manual/mod/directives.html.fr index f78a9bea70b..a13b147fa98 100644 --- a/docs/manual/mod/directives.html.fr +++ b/docs/manual/mod/directives.html.fr @@ -302,10 +302,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -316,6 +318,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index 44672d9726b..d744a8ffdbb 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -298,10 +298,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -312,6 +314,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index e632ddbe70b..1c836261dde 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -298,10 +298,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -312,6 +314,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index 34ec16ec379..a34b1dcf224 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -297,10 +297,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -311,6 +313,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8 index 9b906db54f1..e7ccad1aa13 100644 --- a/docs/manual/mod/directives.html.zh-cn.utf8 +++ b/docs/manual/mod/directives.html.zh-cn.utf8 @@ -296,10 +296,12 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • +
  • H2KeepAliveTimeout
  • H2MaxSessionStreams
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
    • @@ -310,6 +312,8 @@
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2StreamTimeout
    • +
  • H2Timeout
  • H2TLSCoolDownSecs
  • H2TLSWarmUpSize
  • H2Upgrade
    • diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en index e582f3ed5bf..9ea97878d02 100644 --- a/docs/manual/mod/mod_http2.html.en +++ b/docs/manual/mod/mod_http2.html.en @@ -55,9 +55,13 @@ -

    Directives

    + - +
    top
    +
    +

    Environment Variables

    + +

    This module can be configured to provide HTTP/2 related information + as additional environment variables to the SSI and CGI namespace. +

    + + + + + + + + + + +
    Variable Name:Value Type:Description:
    HTTPe flag HTTP/2 is being used.
    H2PUSH flag HTTP/2 Server Push is enabled for this request and also supported by the client.
    + +
    top

    H2Direct Directive

    @@ -119,6 +144,33 @@

    Example

    H2Direct on
    + +
    top
    +

    H2KeepAliveTimeout Directive

    +
    + + + + + + + +
    Description:Timeout (in seconds) for idle HTTP/2 connections
    Syntax:H2KeepAliveTimeout seconds
    Default:H2KeepAliveTimeout 300
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    Compatibility:Available in version 2.4.19 and later.
    +

    + This directive sets the timeout for read/write operations on + idle connections where HTTP/2 is negotiated. This can be used server wide or for specific + <VirtualHost>s. +

    +

    + This directive is similar to the + <KeepAliveTimeout>, but + applies only to HTTP/2 connections. A HTTP/2 connection is considered + idle when no streams are open, e.g. no requests are ongoing. +

    +

    + A value of 0 enforces no timeout. +

    +
    top

    H2MaxSessionStreams Directive

    @@ -447,7 +499,6 @@ H2PushPriority text/css interleaved # weight 256 default - @@ -471,6 +522,11 @@ H2PushPriority text/css interleaved # weight 256 default
    (h2_connections * extra_files) + (h2_max_worker)

    Example

    H2SessionExtraFiles 10
    +

    + If nothing is configured, the module tries to make a conservative + guess how many files are safe to use. This depends largely on the + MPM chosen. +

    top
    @@ -493,6 +549,67 @@ H2PushPriority text/css interleaved # weight 256 default

    Example

    H2StreamMaxMemSize 128000
    + +
    top
    +

    H2StreamTimeout Directive

    +
    Description:Number of Extra File Handles
    Syntax:H2SessionExtraFiles n
    Default:H2SessionExtraFiles 5
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    + + + + + + + +
    Description:Timeout (in seconds) for idle HTTP/2 connections
    Syntax:H2StreamTimeout seconds
    Default:H2StreamTimeout 120
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    Compatibility:Available in version 2.4.19 and later.
    +

    + This directive sets the timeout for read/write operations on + HTTP/2 streams, e.g. individual requests. This can be used server wide or for specific + <VirtualHost>s. +

    +

    + Due to the nature of HTTP/2, which sends multiple requests over a single + connection and has priority scheduling, individual streams might not + see input for much longer times than HTTP/1.1 requests would. +

    +

    + A value of 0 enforces no timeout, so could wait on chances to receive + input or write data indefinitely. This expose a server to + risks of thread exhaustion. +

    +

    + Depending on your handling of pushed streams, + priorities and general responsiveness, a site might need to increase + this value. For example, if you PUSH a large resource before + the requested one, the initial stream will not write until the + pushed resource is fully sent. +

    + +
    +
    top
    +

    H2Timeout Directive

    + + + + + + + + +
    Description:Timeout (in seconds) for HTTP/2 connections
    Syntax:H2Timeout seconds
    Default:H2Timeout 5
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    Compatibility:Available in version 2.4.19 and later.
    +

    + This directive sets the timeout for read/write operations on + connections where HTTP/2 is negotiated. This can be used server wide or for specific + <VirtualHost>s. +

    +

    + This directive is similar to the + <Timeout>, but + applies only to HTTP/2 connections. +

    +

    + A value of 0 enforces no timeout. +

    +
    top

    H2TLSCoolDownSecs Directive

    @@ -630,7 +747,7 @@ H2PushPriority text/css interleaved # weight 256 default - + diff --git a/docs/manual/mod/mod_log_config.html.ja.utf8 b/docs/manual/mod/mod_log_config.html.ja.utf8 index 61ee73763eb..bbe3d8fb228 100644 --- a/docs/manual/mod/mod_log_config.html.ja.utf8 +++ b/docs/manual/mod/mod_log_config.html.ja.utf8 @@ -65,6 +65,7 @@ @@ -393,6 +394,20 @@
    top
    +

    GlobalLog ディレクティブ

    +
    Description:Size of Stream Window for upstream data.
    Syntax:H2WindowSize bytes
    Default:H2WindowSize 65536
    Default:H2WindowSize 65535
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    + + + + + +
    説明:Sets filename and format of log file
    構文:GlobalLog file|pipe|provider +format|nickname +[env=[!]environment-variable| +expr=expression]
    コンテキスト:サーバ設定ファイル
    ステータス:Base
    モジュール:mod_log_config

    このディレクティブの解説文書は + まだ翻訳されていません。英語版をご覧ください。 +

    +
    top

    LogFormat ディレクティブ

    diff --git a/docs/manual/mod/mod_log_config.html.ko.euc-kr b/docs/manual/mod/mod_log_config.html.ko.euc-kr index b6cc0e854c0..0ec72c10b63 100644 --- a/docs/manual/mod/mod_log_config.html.ko.euc-kr +++ b/docs/manual/mod/mod_log_config.html.ko.euc-kr @@ -59,6 +59,7 @@ @@ -328,6 +329,20 @@
    top
    +

    GlobalLog Áö½Ã¾î

    +
    説明:ログファイルで使用する書式を設定する
    + + + + + +
    ¼³¸í:Sets filename and format of log file
    ¹®¹ý:GlobalLog file|pipe|provider +format|nickname +[env=[!]environment-variable| +expr=expression]
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤
    »óÅÂ:Base
    ¸ðµâ:mod_log_config

    The documentation for this directive has + not been translated yet. Please have a look at the English + version.

    +
    top

    LogFormat Áö½Ã¾î

    diff --git a/docs/manual/mod/mod_log_config.html.tr.utf8 b/docs/manual/mod/mod_log_config.html.tr.utf8 index b3c649f7f3d..33be421e075 100644 --- a/docs/manual/mod/mod_log_config.html.tr.utf8 +++ b/docs/manual/mod/mod_log_config.html.tr.utf8 @@ -61,6 +61,7 @@ @@ -441,6 +442,19 @@ expr=ifade]
    top
    +

    GlobalLog Yönergesi

    +
    ¼³¸í:·Î±×ÆÄÀÏ¿¡ »ç¿ëÇÒ Çü½ÄÀ» ±â¼úÇÑ´Ù
    + + + + + +
    Açıklama:Sets filename and format of log file
    Sözdizimi:GlobalLog file|pipe|provider +format|nickname +[env=[!]environment-variable| +expr=expression]
    Bağlam:sunucu geneli
    Durum:Temel
    Modül:mod_log_config

    Bu yönergenin belgesi henüz Türkçeye çevrilmedi. + Lütfen İngilizce sürümüne bakınız.

    +
    top

    LogFormat Yönergesi

    Açıklama:Bir günlük dosyasında kullanılmak üzere girdi biçemi tanımlar. diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index 66c3f6c8f73..3dec71c4ec3 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta index 912229af035..e4f3ee6f495 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ en - fr + fr