From: André Malo Date: Sun, 6 Dec 2015 19:46:04 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.4.18~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f5ea4cffb22c6241e0854e45835e87bd5ed69a3;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1718210 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index fd639959b7f..1d6a4866ed5 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -245,9 +245,15 @@ h2maxsessionstreams mod/mod_http2.html#h2maxsessionstreams h2maxworkeridleseconds mod/mod_http2.html#h2maxworkeridleseconds h2maxworkers mod/mod_http2.html#h2maxworkers h2minworkers mod/mod_http2.html#h2minworkers +h2moderntlsonly mod/mod_http2.html#h2moderntlsonly +h2push mod/mod_http2.html#h2push +h2pushpriority mod/mod_http2.html#h2pushpriority h2serializeheaders mod/mod_http2.html#h2serializeheaders h2sessionextrafiles mod/mod_http2.html#h2sessionextrafiles h2streammaxmemsize mod/mod_http2.html#h2streammaxmemsize +h2tlscooldownsecs mod/mod_http2.html#h2tlscooldownsecs +h2tlswarmupsize mod/mod_http2.html#h2tlswarmupsize +h2upgrade mod/mod_http2.html#h2upgrade h2windowsize mod/mod_http2.html#h2windowsize header mod/mod_headers.html#header headername mod/mod_autoindex.html#headername @@ -426,6 +432,7 @@ proxysourceaddress mod/mod_proxy.html#proxysourceaddress proxystatus mod/mod_proxy.html#proxystatus proxytimeout mod/mod_proxy.html#proxytimeout proxyvia mod/mod_proxy.html#proxyvia +qualifyredirecturl mod/core.html#qualifyredirecturl readmename mod/mod_autoindex.html#readmename receivebuffersize mod/mpm_common.html#receivebuffersize redirect mod/mod_alias.html#redirect diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index d23695771cd..8b9f60e0797 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -287,9 +287,15 @@
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
  • H2MinWorkers
    • +
  • H2ModernTLSOnly
    • +
  • H2Push
    • +
  • H2PushPriority
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2TLSCoolDownSecs
    • +
  • H2TLSWarmUpSize
    • +
  • H2Upgrade
  • H2WindowSize
  • Header
  • HeaderName
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index 556ebce96b6..06f11c3e20a 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -290,9 +290,15 @@
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
  • H2MinWorkers
    • +
  • H2ModernTLSOnly
    • +
  • H2Push
    • +
  • H2PushPriority
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2TLSCoolDownSecs
    • +
  • H2TLSWarmUpSize
    • +
  • H2Upgrade
  • H2WindowSize
  • Header
  • HeaderName
    • diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index 045559b9ee3..dc7e82168e1 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -285,9 +285,15 @@
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
  • H2MinWorkers
    • +
  • H2ModernTLSOnly
    • +
  • H2Push
    • +
  • H2PushPriority
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2TLSCoolDownSecs
    • +
  • H2TLSWarmUpSize
    • +
  • H2Upgrade
  • H2WindowSize
  • Header
  • HeaderName
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index 5c6cef9f31b..63ac3033a88 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -285,9 +285,15 @@
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
  • H2MinWorkers
    • +
  • H2ModernTLSOnly
    • +
  • H2Push
    • +
  • H2PushPriority
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2TLSCoolDownSecs
    • +
  • H2TLSWarmUpSize
    • +
  • H2Upgrade
  • H2WindowSize
  • Header
  • HeaderName
    • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index efc532cb8da..3f3ec118fd0 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -284,9 +284,15 @@
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
  • H2MinWorkers
    • +
  • H2ModernTLSOnly
    • +
  • H2Push
    • +
  • H2PushPriority
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2TLSCoolDownSecs
    • +
  • H2TLSWarmUpSize
    • +
  • H2Upgrade
  • H2WindowSize
  • Header
  • HeaderName
    • diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8 index 750feaaa078..1b05f396224 100644 --- a/docs/manual/mod/directives.html.zh-cn.utf8 +++ b/docs/manual/mod/directives.html.zh-cn.utf8 @@ -283,9 +283,15 @@
  • H2MaxWorkerIdleSeconds
  • H2MaxWorkers
  • H2MinWorkers
    • +
  • H2ModernTLSOnly
    • +
  • H2Push
    • +
  • H2PushPriority
  • H2SerializeHeaders
  • H2SessionExtraFiles
  • H2StreamMaxMemSize
    • +
  • H2TLSCoolDownSecs
    • +
  • H2TLSWarmUpSize
    • +
  • H2Upgrade
  • H2WindowSize
  • Header
  • HeaderName
    • diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index a0ab91e63cf..55792fee196 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -472,14 +472,20 @@ angegebenen MIME-Content-Type will exit. Group unix-group #-1 sBGroup under which the server will answer requests -H2Direct on|off on (for non TLS) svEH2 Direct Protocol Switch +H2Direct on|off on for h2c, off for +svEH2 Direct Protocol Switch H2MaxSessionStreams n 100 svEMaximum number of active streams per HTTP/2 session. H2MaxWorkerIdleSeconds n 600 sEMaximum number of seconds h2 workers remain idle until shut down. H2MaxWorkers nsEMaximum number of worker threads to use per child process. H2MinWorkers nsEMinimal number of worker threads to use per child process. -H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2ModernTLSOnly on|off on svERequire HTTP/2 connections to be "modern TLS" only +H2Push on|off on svEH2 Server Push Switch +H2PushPriority mime-type [after|before|interleaved] [weight] * After 16 svEH2 Server Push Priority +H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2TLSCoolDownSecs seconds 1 svE- +H2TLSWarmUpSize amount 1048576 svE- +H2Upgrade on|off on for h2c, off for +svEH2 Upgrade Protocol Switch H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note header [[expr=]value [replacement] diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 2f3f0b31df7..31b0f109878 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -474,14 +474,20 @@ media type in the HTTP Content-Type header field will exit. Group unix-group #-1 sBGroup under which the server will answer requests -H2Direct on|off on (for non TLS) svEH2 Direct Protocol Switch +H2Direct on|off on for h2c, off for +svEH2 Direct Protocol Switch H2MaxSessionStreams n 100 svEMaximum number of active streams per HTTP/2 session. H2MaxWorkerIdleSeconds n 600 sEMaximum number of seconds h2 workers remain idle until shut down. H2MaxWorkers nsEMaximum number of worker threads to use per child process. H2MinWorkers nsEMinimal number of worker threads to use per child process. -H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2ModernTLSOnly on|off on svERequire HTTP/2 connections to be "modern TLS" only +H2Push on|off on svEH2 Server Push Switch +H2PushPriority mime-type [after|before|interleaved] [weight] * After 16 svEH2 Server Push Priority +H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2TLSCoolDownSecs seconds 1 svE- +H2TLSWarmUpSize amount 1048576 svE- +H2Upgrade on|off on for h2c, off for +svEH2 Upgrade Protocol Switch H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note header [[expr=]value [replacement] diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index c1963b0f358..fa1d38fddbc 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -443,14 +443,20 @@ request GracefulShutDownTimeout secondssM穏やかな停止をかけた後、終了するまで待つ時間 Group unix-group #-1 sBGroup under which the server will answer requests -H2Direct on|off on (for non TLS) svEH2 Direct Protocol Switch +H2Direct on|off on for h2c, off for +svEH2 Direct Protocol Switch H2MaxSessionStreams n 100 svEMaximum number of active streams per HTTP/2 session. H2MaxWorkerIdleSeconds n 600 sEMaximum number of seconds h2 workers remain idle until shut down. H2MaxWorkers nsEMaximum number of worker threads to use per child process. H2MinWorkers nsEMinimal number of worker threads to use per child process. -H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2ModernTLSOnly on|off on svERequire HTTP/2 connections to be "modern TLS" only +H2Push on|off on svEH2 Server Push Switch +H2PushPriority mime-type [after|before|interleaved] [weight] * After 16 svEH2 Server Push Priority +H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2TLSCoolDownSecs seconds 1 svE- +H2TLSWarmUpSize amount 1048576 svE- +H2Upgrade on|off on for h2c, off for +svEH2 Upgrade Protocol Switch H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] set|append|add|unset|echo header [value] [early|env=[!]variable]svdhEHTTP 応答ヘッダの設定 diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index eac1a2bef3b..e1a577fcaea 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -443,14 +443,20 @@ media type in the HTTP Content-Type header field will exit. Group unix-group #-1 sBGroup under which the server will answer requests -H2Direct on|off on (for non TLS) svEH2 Direct Protocol Switch +H2Direct on|off on for h2c, off for +svEH2 Direct Protocol Switch H2MaxSessionStreams n 100 svEMaximum number of active streams per HTTP/2 session. H2MaxWorkerIdleSeconds n 600 sEMaximum number of seconds h2 workers remain idle until shut down. H2MaxWorkers nsEMaximum number of worker threads to use per child process. H2MinWorkers nsEMinimal number of worker threads to use per child process. -H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2ModernTLSOnly on|off on svERequire HTTP/2 connections to be "modern TLS" only +H2Push on|off on svEH2 Server Push Switch +H2PushPriority mime-type [after|before|interleaved] [weight] * After 16 svEH2 Server Push Priority +H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2TLSCoolDownSecs seconds 1 svE- +H2TLSWarmUpSize amount 1048576 svE- +H2Upgrade on|off on for h2c, off for +svEH2 Upgrade Protocol Switch H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] set|append|add|unset|echo header [value] [early|env=[!]variable]svdhEHTTP ÀÀ´ä Çì´õ¸¦ ±¸¼ºÇÑ´Ù diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index ff7599c4390..425921baafb 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -465,14 +465,20 @@ found GracefulShutdownTimeout saniye 0 sMSunucunun nazikçe kapatılmasının ardından ana süreç çıkana kadar geçecek süre için bir zaman aşımı belirler. Group unix-grubu #-1 sTÄ°steklere yanıt verecek sunucunun ait olacağı grubu belirler. -H2Direct on|off on (for non TLS) skEH2 Direct Protocol Switch +H2Direct on|off on for h2c, off for +skEH2 Direct Protocol Switch H2MaxSessionStreams n 100 skEMaximum number of active streams per HTTP/2 session. H2MaxWorkerIdleSeconds n 600 sEMaximum number of seconds h2 workers remain idle until shut down. H2MaxWorkers nsEMaximum number of worker threads to use per child process. H2MinWorkers nsEMinimal number of worker threads to use per child process. -H2SerializeHeaders on|off off skESerialize Request/Response Processing Switch -H2SessionExtraFiles n 5 skENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 skEMaximum amount of output data buffered per stream. +H2ModernTLSOnly on|off on skERequire HTTP/2 connections to be "modern TLS" only +H2Push on|off on skEH2 Server Push Switch +H2PushPriority mime-type [after|before|interleaved] [weight] * After 16 skEH2 Server Push Priority +H2SerializeHeaders on|off off skESerialize Request/Response Processing Switch +H2SessionExtraFiles n 5 skENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 skEMaximum amount of output data buffered per stream. +H2TLSCoolDownSecs seconds 1 skE- +H2TLSWarmUpSize amount 1048576 skE- +H2Upgrade on|off on for h2c, off for +skEH2 Upgrade Protocol Switch H2WindowSize bytes 65536 skESize of Stream Window for upstream data. Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note header [[expr=]value [replacement] diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index ff04906d6d0..be1c123ba13 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -462,14 +462,20 @@ media type in the HTTP Content-Type header field will exit. Group unix-group #-1 sBGroup under which the server will answer requests -H2Direct on|off on (for non TLS) svEH2 Direct Protocol Switch +H2Direct on|off on for h2c, off for +svEH2 Direct Protocol Switch H2MaxSessionStreams n 100 svEMaximum number of active streams per HTTP/2 session. H2MaxWorkerIdleSeconds n 600 sEMaximum number of seconds h2 workers remain idle until shut down. H2MaxWorkers nsEMaximum number of worker threads to use per child process. H2MinWorkers nsEMinimal number of worker threads to use per child process. -H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2ModernTLSOnly on|off on svERequire HTTP/2 connections to be "modern TLS" only +H2Push on|off on svEH2 Server Push Switch +H2PushPriority mime-type [after|before|interleaved] [weight] * After 16 svEH2 Server Push Priority +H2SerializeHeaders on|off off svESerialize Request/Response Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2TLSCoolDownSecs seconds 1 svE- +H2TLSWarmUpSize amount 1048576 svE- +H2Upgrade on|off on for h2c, off for +svEH2 Upgrade Protocol Switch H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note header [[expr=]value [replacement]