From: Jim Jagielski Date: Mon, 28 Sep 2015 19:30:00 +0000 (+0000) Subject: Merge r1705749 from trunk: X-Git-Tag: 2.4.17~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ce5d4ab53a2a0da7f79b4a25469ac96900ecb0;p=thirdparty%2Fapache%2Fhttpd.git Merge r1705749 from trunk: bye bye mod_h2, hello mod_http2 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705751 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 8e66679bec3..d22c00c5079 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -137,7 +137,7 @@ BEGIN { print "#LoadModule ext_filter_module modules/mod_ext_filter.so" > dstfl; print "#LoadModule file_cache_module modules/mod_file_cache.so" > dstfl; print "#LoadModule filter_module modules/mod_filter.so" > dstfl; - print "#LoadModule h2_module modules/mod_h2.so" > dstfl; + print "#LoadModule http2_module modules/mod_http2.so" > dstfl; print "#LoadModule headers_module modules/mod_headers.so" > dstfl; print "#LoadModule heartbeat_module modules/mod_heartbeat.so" > dstfl; print "#LoadModule heartmonitor_module modules/mod_heartmonitor.so" > dstfl; diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 298ad84ca7b..92d2273b747 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -240,15 +240,15 @@ forensiclog mod/mod_log_forensic.html#forensiclog gprofdir mod/core.html#gprofdir gracefulshutdowntimeout mod/mpm_common.html#gracefulshutdowntimeout group mod/mod_unixd.html#group -h2direct mod/mod_h2.html#h2direct -h2maxsessionstreams mod/mod_h2.html#h2maxsessionstreams -h2maxworkeridleseconds mod/mod_h2.html#h2maxworkeridleseconds -h2maxworkers mod/mod_h2.html#h2maxworkers -h2minworkers mod/mod_h2.html#h2minworkers -h2serializeheaders mod/mod_h2.html#h2serializeheaders -h2sessionextrafiles mod/mod_h2.html#h2sessionextrafiles -h2streammaxmemsize mod/mod_h2.html#h2streammaxmemsize -h2windowsize mod/mod_h2.html#h2windowsize +h2direct mod/mod_http2.html#h2direct +h2maxsessionstreams mod/mod_http2.html#h2maxsessionstreams +h2maxworkeridleseconds mod/mod_http2.html#h2maxworkeridleseconds +h2maxworkers mod/mod_http2.html#h2maxworkers +h2minworkers mod/mod_http2.html#h2minworkers +h2serializeheaders mod/mod_http2.html#h2serializeheaders +h2sessionextrafiles mod/mod_http2.html#h2sessionextrafiles +h2streammaxmemsize mod/mod_http2.html#h2streammaxmemsize +h2windowsize mod/mod_http2.html#h2windowsize header mod/mod_headers.html#header headername mod/mod_autoindex.html#headername heartbeataddress mod/mod_heartbeat.html#heartbeataddress diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index fbc20266d19..210782f6dfb 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -51,7 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 4e701cfc6a7..371c1163ce5 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -51,7 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 7f3bbd844d1..9d29757ea6c 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -51,7 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 88c2b2d02e1..14057da9786 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -51,7 +51,7 @@ mod_ext_filter.xml.fr mod_file_cache.xml.fr mod_filter.xml.fr - mod_h2.xml + mod_http2.xml mod_headers.xml.fr mod_heartbeat.xml.fr mod_heartmonitor.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index 3ac52d8c7d1..d6be77dea98 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -51,7 +51,7 @@ mod_ext_filter.xml.ja mod_file_cache.xml mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml.ja mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 32eefea0c02..890f8a09936 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -51,7 +51,7 @@ mod_ext_filter.xml.ko mod_file_cache.xml.ko mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml.ko mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index f9dc7dcc98c..58dca3fc9c6 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -51,7 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index fbc20266d19..210782f6dfb 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -51,7 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml - mod_h2.xml + mod_http2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index d4d87195a77..fb6b08a53d4 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -282,15 +282,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -699,4 +699,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index fb17a54a16c..648652cf87b 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -283,15 +283,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -700,4 +700,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index debc69cd200..741e360b094 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -285,15 +285,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -702,4 +702,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.fr b/docs/manual/mod/directives.html.fr index 2e905167734..d6ac0ab317b 100644 --- a/docs/manual/mod/directives.html.fr +++ b/docs/manual/mod/directives.html.fr @@ -283,15 +283,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -700,4 +700,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index 664766a900b..4a4f5c44116 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -280,15 +280,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -697,4 +697,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index b7e06393b03..a7937649594 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -280,15 +280,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -697,4 +697,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index 2864c444a53..0f1f55e6dc6 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -279,15 +279,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -696,4 +696,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8 index 1495090bcda..d85bf9fd959 100644 --- a/docs/manual/mod/directives.html.zh-cn.utf8 +++ b/docs/manual/mod/directives.html.zh-cn.utf8 @@ -278,15 +278,15 @@
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • -
  • H2Direct
  • -
  • H2MaxSessionStreams
  • -
  • H2MaxWorkerIdleSeconds
  • -
  • H2MaxWorkers
  • -
  • H2MinWorkers
  • -
  • H2SerializeHeaders
  • -
  • H2SessionExtraFiles
  • -
  • H2StreamMaxMemSize
  • -
  • H2WindowSize
  • +
  • H2Direct
  • +
  • H2MaxSessionStreams
  • +
  • H2MaxWorkerIdleSeconds
  • +
  • H2MaxWorkers
  • +
  • H2MinWorkers
  • +
  • H2SerializeHeaders
  • +
  • H2SessionExtraFiles
  • +
  • H2StreamMaxMemSize
  • +
  • H2WindowSize
  • Header
  • HeaderName
  • HeartbeatAddress
  • @@ -695,4 +695,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de index 60e30a28598..2e65a67755f 100644 --- a/docs/manual/mod/index.html.de +++ b/docs/manual/mod/index.html.de @@ -143,7 +143,7 @@ criteria delivery to the client
    mod_file_cache
    Caches a static list of files in memory
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    Customization of HTTP request and response headers
    mod_heartbeat
    Sends messages with server status to frontend proxy
    @@ -265,4 +265,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index f34c7beef3e..630f95aea07 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -139,7 +139,7 @@ criteria delivery to the client
    mod_file_cache
    Caches a static list of files in memory
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    Customization of HTTP request and response headers
    mod_heartbeat
    Sends messages with server status to frontend proxy
    @@ -261,4 +261,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es index b8e9b3f3cea..ee3cb27ea39 100644 --- a/docs/manual/mod/index.html.es +++ b/docs/manual/mod/index.html.es @@ -144,7 +144,7 @@ criteria delivery to the client
    mod_file_cache
    Caches a static list of files in memory
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    Customization of HTTP request and response headers
    mod_heartbeat
    Sends messages with server status to frontend proxy
    @@ -266,4 +266,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.fr b/docs/manual/mod/index.html.fr index db4e1b44c00..7f7e232d074 100644 --- a/docs/manual/mod/index.html.fr +++ b/docs/manual/mod/index.html.fr @@ -160,7 +160,7 @@ externe avant de l'envoyer au client fichiers
    mod_filter
    Module de configuration de filtre intelligent sensible au contexte
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    Personnalisation des en-têtes de requêtes et de réponses HTTP
    mod_heartbeat
    Envoie des messages d'état au mandataire frontal
    @@ -309,4 +309,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8 index 7e66456c2a4..0ac50ee8411 100644 --- a/docs/manual/mod/index.html.ja.utf8 +++ b/docs/manual/mod/index.html.ja.utf8 @@ -133,7 +133,7 @@ HTTP caching filter.
    mod_ext_filter
    レスポンスのボディをクライアントに送る前に外部プログラムで処理する
    mod_file_cache
    Caches a static list of files in memory
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    HTTP リクエストのヘッダと応答のヘッダのカスタマイズ
    mod_heartbeat
    Sends messages with server status to frontend proxy
    mod_heartmonitor
    Centralized monitor for mod_heartbeat origin servers
    @@ -251,4 +251,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr index 11e82c93194..5fe982623ac 100644 --- a/docs/manual/mod/index.html.ko.euc-kr +++ b/docs/manual/mod/index.html.ko.euc-kr @@ -131,7 +131,7 @@ index º¸³½´Ù
    mod_file_cache
    ¸Þ¸ð¸®¿¡ Á¤Àû ÆÄÀϵéÀ» ij½¬
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    HTTP ¿äû Çì´õ¿Í ÀÀ´ä Çì´õ ¼öÁ¤
    mod_heartbeat
    Sends messages with server status to frontend proxy
    mod_heartmonitor
    Centralized monitor for mod_heartbeat origin servers
    @@ -247,4 +247,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8 index 083be2366b3..2d348deb69c 100644 --- a/docs/manual/mod/index.html.tr.utf8 +++ b/docs/manual/mod/index.html.tr.utf8 @@ -133,7 +133,7 @@ criteria delivery to the client
    mod_file_cache
    Caches a static list of files in memory
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    Customization of HTTP request and response headers
    mod_heartbeat
    Sends messages with server status to frontend proxy
    @@ -254,4 +254,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/index.html.zh-cn.utf8 b/docs/manual/mod/index.html.zh-cn.utf8 index 4eeeb89c4cc..f9539257b44 100644 --- a/docs/manual/mod/index.html.zh-cn.utf8 +++ b/docs/manual/mod/index.html.zh-cn.utf8 @@ -134,7 +134,7 @@ criteria delivery to the client
    mod_file_cache
    Caches a static list of files in memory
    mod_filter
    Context-sensitive smart filter configuration module
    -
    mod_h2
    Support for the HTTP/2 transport layer
    +
    mod_http2
    Support for the HTTP/2 transport layer
    mod_headers
    Customization of HTTP request and response headers
    mod_heartbeat
    Sends messages with server status to frontend proxy
    @@ -256,4 +256,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/mod_h2.html b/docs/manual/mod/mod_http2.html similarity index 81% rename from docs/manual/mod/mod_h2.html rename to docs/manual/mod/mod_http2.html index 9346e292d03..508c6697436 100644 --- a/docs/manual/mod/mod_h2.html +++ b/docs/manual/mod/mod_http2.html @@ -1,5 +1,5 @@ # GENERATED FROM XML -- DO NOT EDIT -URI: mod_h2.html.en +URI: mod_http2.html.en Content-Language: en Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en new file mode 100644 index 00000000000..c0e571ab04b --- /dev/null +++ b/docs/manual/mod/mod_http2.html.en @@ -0,0 +1,287 @@ + + + + + +mod_http2 - Apache HTTP Server Version 2.5 + + + + + + + + +
    <-
    +
    +Apache > HTTP Server > Documentation > Version 2.5 > Modules
    +
    +

    Apache Module mod_http2

    +
    +

    Available Languages:  en 

    +
    + + + +
    Description:Support for the HTTP/2 transport layer
    Status:Extension
    Module Identifier:h2_module
    Source File:mod_http2.c
    +

    Summary

    + +

    This module provides HTTP/2 (RFC 7540) support for the Apache + HTTP Server.

    + +

    This module relies on libnghttp2 + to provide the core http/2 engine.

    + +
    + + +
    top
    +

    H2Direct Directive

    + + + + + + + +
    Description:H2 Direct Protocol Switch
    Syntax:H2Direct on|off
    Default:H2Direct on (for non TLS)
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    +

    + This directive toggles the usage of the HTTP/2 Direct Mode. This + should be used inside a + <VirtualHost> + section to enable direct HTTP/2 communication for that virtual host. + Direct communication means that if the first bytes received by the + server on a connection match the HTTP/2 preamble, the HTTP/2 + protocol is switched to immediately without further negotiation. + This mode falls outside the RFC 7540 but has become widely implemented + as it is very convenient for development and testing. + By default the direct HTTP/2 mode is enabled. +

    +

    Example

    H2Direct on
    +
    + +
    +
    top
    +

    H2MaxSessionStreams Directive

    + + + + + + + +
    Description:Maximum number of active streams per HTTP/2 session.
    Syntax:H2MaxSessionStreams n
    Default:H2MaxSessionStreams 100
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    +

    + This directive sets the maximum number of active streams per HTTP/2 session (e.g. connection) + that the server allows. A stream is active if it is not idle or + closed according to RFC 7540. +

    +

    Example

    H2MaxSessionStreams 20
    +
    + +
    +
    top
    +

    H2MaxWorkerIdleSeconds Directive

    + + + + + + + +
    Description:Maximum number of seconds h2 workers remain idle until shut down.
    Syntax:H2MaxWorkerIdleSeconds n
    Default:H2MaxWorkerIdleSeconds 600
    Context:server config
    Status:Extension
    Module:mod_http2
    +

    + This directive sets the maximum number of seconds a h2 worker may + idle until it shuts itself down. This only happens while the number of + h2 workers exceeds H2MinWorkers. +

    +

    Example

    H2MaxWorkerIdleSeconds 20
    +
    + +
    +
    top
    +

    H2MaxWorkers Directive

    + + + + + + +
    Description:Maximum number of worker threads to use per child process.
    Syntax:H2MaxWorkers n
    Context:server config
    Status:Extension
    Module:mod_http2
    +

    + This directive sets the maximum number of worker threads to spawn + per child process for HTTP/2 processing. If this directive is not used, + mod_http2 will chose a value suitable for the mpm + module loaded. +

    +

    Example

    H2MaxWorkers 20
    +
    + +
    +
    top
    +

    H2MinWorkers Directive

    + + + + + + +
    Description:Minimal number of worker threads to use per child process.
    Syntax:H2MinWorkers n
    Context:server config
    Status:Extension
    Module:mod_http2
    +

    + This directive sets the minimum number of worker threads to spawn + per child process for HTTP/2 processing. If this directive is not used, + mod_http2 will chose a value suitable for the mpm + module loaded. +

    +

    Example

    H2MinWorkers 10
    +
    + +
    +
    top
    +

    H2SerializeHeaders Directive

    + + + + + + + +
    Description:Serialize Request/Resoonse Processing Switch
    Syntax:H2SerializeHeaders on|off
    Default:H2SerializeHeaders off
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    +

    + This directive toggles if HTTP/2 requests shall be serialized in + HTTP/1.1 format for processing by httpd core or if + received binary data shall be passed into the request_recs + directly. +

    +

    + Serialization will lower performance, but gives more backward + compatibility in case custom filters/hooks need it. +

    +

    Example

    H2SerializeHeaders on
    +
    + +
    +
    top
    +

    H2SessionExtraFiles Directive

    + + + + + + + +
    Description:Number of Extra File Handles
    Syntax:H2SessionExtraFiles n
    Default:H2SessionExtraFiles 5
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    +

    + This directive sets maximum number of extra file handles + a HTTP/2 session is allowed to use. A file handle is counted as + extra when it is transfered from a h2 worker thread to + the main HTTP/2 connection handling. This commonly happens when + serving static files. +

    + Depending on the processing model configured on the server, the + number of connections times number of active streams may exceed + the number of file handles for the process. On the other hand, + converting every file into memory bytes early results in too + many buffer writes. This option helps to mitigate that. +

    + The number of file handles used by a server process is then in + the order of: +

    +
    (h2_connections * extra_files) + (h2_max_worker)
    +

    Example

    H2SessionExtraFiles 10
    +
    + +
    +
    top
    +

    H2StreamMaxMemSize Directive

    + + + + + + + +
    Description:Maximum amount of output data buffered per stream.
    Syntax:H2StreamMaxMemSize bytes
    Default:H2StreamMaxMemSize 65536
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    +

    + This directive sets the maximum number of outgoing data bytes buffered in memory + for an active streams. This memory is not allocated per stream as such. Allocations + are counted against this limit when they are about to be done. Stream processing + freezes when the limit has been reached and will only continue when buffered data + has been sent out to the client. +

    +

    Example

    H2StreamMaxMemSize 128000
    +
    + +
    +
    top
    +

    H2WindowSize Directive

    + + + + + + + +
    Description:Size of Stream Window for upstream data.
    Syntax:H2WindowSize bytes
    Default:H2WindowSize 65536
    Context:server config, virtual host
    Status:Extension
    Module:mod_http2
    +

    + This directive sets the size of the window that is used for flow control + from client to server and limits the amount of data the server has to buffer. + The client will stop sending on a stream once the limit has been reached until + the server announces more available space (as it has processed some of the data). +

    + This limit affects only request bodies, not its meta data such as headers. Also, + it has no effect on response bodies as the window size for those are managed + by the clients. +

    +

    Example

    H2WindowSize 128000
    +
    + +
    +
    +
    +

    Available Languages:  en 

    +
    top

    Comments

    Notice:
    This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our mailing lists.
    +
    + diff --git a/docs/manual/mod/mod_http2.xml b/docs/manual/mod/mod_http2.xml new file mode 100644 index 00000000000..00490d81947 --- /dev/null +++ b/docs/manual/mod/mod_http2.xml @@ -0,0 +1,284 @@ + + + + + + + + + + mod_http2 + Support for the HTTP/2 transport layer + Extension + mod_http2.c + h2_module + + +

    This module provides HTTP/2 (RFC 7540) support for the Apache + HTTP Server.

    + +

    This module relies on libnghttp2 + to provide the core http/2 engine.

    + + Warning +

    This module is experimental. Its behaviors, directives, and + defaults are subject to more frequent and change from release to + release relative to other standard modules. Users are encouraged to + consult the "CHANGES" file for potential updates.

    +
    +
    + + + H2Direct + H2 Direct Protocol Switch + H2Direct on|off + H2Direct on (for non TLS) + + server config + virtual host + + + +

    + This directive toggles the usage of the HTTP/2 Direct Mode. This + should be used inside a + VirtualHost + section to enable direct HTTP/2 communication for that virtual host. + Direct communication means that if the first bytes received by the + server on a connection match the HTTP/2 preamble, the HTTP/2 + protocol is switched to immediately without further negotiation. + This mode falls outside the RFC 7540 but has become widely implemented + as it is very convenient for development and testing. + By default the direct HTTP/2 mode is enabled. +

    + Example + + H2Direct on + + +
    +
    + + + H2MaxSessionStreams + Maximum number of active streams per HTTP/2 session. + H2MaxSessionStreams n + H2MaxSessionStreams 100 + + server config + virtual host + + +

    + This directive sets the maximum number of active streams per HTTP/2 session (e.g. connection) + that the server allows. A stream is active if it is not idle or + closed according to RFC 7540. +

    + Example + + H2MaxSessionStreams 20 + + +
    +
    + + + H2StreamMaxMemSize + Maximum amount of output data buffered per stream. + H2StreamMaxMemSize bytes + H2StreamMaxMemSize 65536 + + server config + virtual host + + +

    + This directive sets the maximum number of outgoing data bytes buffered in memory + for an active streams. This memory is not allocated per stream as such. Allocations + are counted against this limit when they are about to be done. Stream processing + freezes when the limit has been reached and will only continue when buffered data + has been sent out to the client. +

    + Example + + H2StreamMaxMemSize 128000 + + +
    +
    + + + H2WindowSize + Size of Stream Window for upstream data. + H2WindowSize bytes + H2WindowSize 65536 + + server config + virtual host + + +

    + This directive sets the size of the window that is used for flow control + from client to server and limits the amount of data the server has to buffer. + The client will stop sending on a stream once the limit has been reached until + the server announces more available space (as it has processed some of the data). +

    + This limit affects only request bodies, not its meta data such as headers. Also, + it has no effect on response bodies as the window size for those are managed + by the clients. +

    + Example + + H2WindowSize 128000 + + +
    +
    + + + H2MinWorkers + Minimal number of worker threads to use per child process. + H2MinWorkers n + + server config + + +

    + This directive sets the minimum number of worker threads to spawn + per child process for HTTP/2 processing. If this directive is not used, + mod_http2 will chose a value suitable for the mpm + module loaded. +

    + Example + + H2MinWorkers 10 + + +
    +
    + + + H2MaxWorkers + Maximum number of worker threads to use per child process. + H2MaxWorkers n + + server config + + +

    + This directive sets the maximum number of worker threads to spawn + per child process for HTTP/2 processing. If this directive is not used, + mod_http2 will chose a value suitable for the mpm + module loaded. +

    + Example + + H2MaxWorkers 20 + + +
    +
    + + + H2MaxWorkerIdleSeconds + Maximum number of seconds h2 workers remain idle until shut down. + H2MaxWorkerIdleSeconds n + H2MaxWorkerIdleSeconds 600 + + server config + + +

    + This directive sets the maximum number of seconds a h2 worker may + idle until it shuts itself down. This only happens while the number of + h2 workers exceeds H2MinWorkers. +

    + Example + + H2MaxWorkerIdleSeconds 20 + + +
    +
    + + + H2SessionExtraFiles + Number of Extra File Handles + H2SessionExtraFiles n + H2SessionExtraFiles 5 + + server config + virtual host + + +

    + This directive sets maximum number of extra file handles + a HTTP/2 session is allowed to use. A file handle is counted as + extra when it is transfered from a h2 worker thread to + the main HTTP/2 connection handling. This commonly happens when + serving static files. +

    + Depending on the processing model configured on the server, the + number of connections times number of active streams may exceed + the number of file handles for the process. On the other hand, + converting every file into memory bytes early results in too + many buffer writes. This option helps to mitigate that. +

    + The number of file handles used by a server process is then in + the order of: +

    +
    +                (h2_connections * extra_files) + (h2_max_worker)
    +            
    + Example + + H2SessionExtraFiles 10 + + +
    +
    + + + H2SerializeHeaders + Serialize Request/Resoonse Processing Switch + H2SerializeHeaders on|off + H2SerializeHeaders off + + server config + virtual host + + +

    + This directive toggles if HTTP/2 requests shall be serialized in + HTTP/1.1 format for processing by httpd core or if + received binary data shall be passed into the request_recs + directly. +

    +

    + Serialization will lower performance, but gives more backward + compatibility in case custom filters/hooks need it. +

    + Example + + H2SerializeHeaders on + + +
    +
    + +
    diff --git a/docs/manual/mod/mod_h2.xml.meta b/docs/manual/mod/mod_http2.xml.meta similarity index 73% rename from docs/manual/mod/mod_h2.xml.meta rename to docs/manual/mod/mod_http2.xml.meta index ff80d56469d..500e9da4cb1 100644 --- a/docs/manual/mod/mod_h2.xml.meta +++ b/docs/manual/mod/mod_http2.xml.meta @@ -1,8 +1,8 @@ - - mod_h2 + + mod_http2 /mod/ .. diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 108f98a1863..7ff585f4170 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -472,15 +472,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 svESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +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] [early|env=[!]varname|expr=expression]] @@ -1130,4 +1130,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index d46c3764f8c..66219aa8d6b 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -467,15 +467,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 svESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +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] [early|env=[!]varname|expr=expression]] @@ -1115,4 +1115,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 4512f87459a..2d0eedf57f4 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -474,15 +474,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 svESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +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] [early|env=[!]varname|expr=expression]] @@ -1123,4 +1123,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index c444383f0be..2933cfde6d0 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -443,15 +443,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 svESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] set|append|add|unset|echo header [value] [early|env=[!]variable]svdhEHTTP 応答ヘッダの設定 HeaderName filenamesvdhB @@ -1045,4 +1045,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 84af45d5908..05c35b048a1 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -443,15 +443,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 svESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +H2WindowSize bytes 65536 svESize of Stream Window for upstream data. Header [condition] set|append|add|unset|echo header [value] [early|env=[!]variable]svdhEHTTP ÀÀ´ä Çì´õ¸¦ ±¸¼ºÇÑ´Ù HeaderName filenamesvdhBÆÄÀϸñ·Ï À§¿¡ »ðÀÔÇÒ ÆÄÀÏÀÇ À̸§ @@ -1073,4 +1073,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index d7a01e758d4..0284baf7261 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -465,15 +465,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 skENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 skEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 skESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 skENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 skEMaximum amount of output data buffered per stream. +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] [early|env=[!]varname|expr=expression]] @@ -1118,4 +1118,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index f3402f1a350..4f54a294171 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -462,15 +462,15 @@ 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 -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/Resoonse Processing Switch -H2SessionExtraFiles n 5 svENumber of Extra File Handles -H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. -H2WindowSize bytes 65536 svESize of Stream Window for upstream data. +H2Direct on|off on (for non TLS) 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/Resoonse Processing Switch +H2SessionExtraFiles n 5 svENumber of Extra File Handles +H2StreamMaxMemSize bytes 65536 svEMaximum amount of output data buffered per stream. +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] [early|env=[!]varname|expr=expression]] @@ -1110,4 +1110,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de index e743c4b58db..fe5c1d899d4 100644 --- a/docs/manual/sitemap.html.de +++ b/docs/manual/sitemap.html.de @@ -237,7 +237,7 @@ HPUX betreiben
  • Apache-Modul mod_ext_filter
  • Apache-Modul mod_file_cache
  • Apache-Modul mod_filter
  • -
  • Apache-Modul mod_h2
  • +
  • Apache-Modul mod_http2
  • Apache-Modul mod_headers
  • Apache-Modul mod_heartbeat
  • Apache-Modul mod_heartmonitor
  • @@ -363,4 +363,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en index badfe0fea2b..1ef22b85b18 100644 --- a/docs/manual/sitemap.html.en +++ b/docs/manual/sitemap.html.en @@ -237,7 +237,7 @@ log_server_status
  • Apache Module mod_ext_filter
  • Apache Module mod_file_cache
  • Apache Module mod_filter
  • -
  • Apache Module mod_h2
  • +
  • Apache Module mod_http2
  • Apache Module mod_headers
  • Apache Module mod_heartbeat
  • Apache Module mod_heartmonitor
  • @@ -362,4 +362,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es index ff00f3b07d9..2fe99aa8e26 100644 --- a/docs/manual/sitemap.html.es +++ b/docs/manual/sitemap.html.es @@ -219,7 +219,7 @@ usados para describir las directivas de Apache
  • Módulo Apache mod_ext_filter
  • Módulo Apache mod_file_cache
  • Módulo Apache mod_filter
  • -
  • Módulo Apache mod_h2
  • +
  • Módulo Apache mod_http2
  • Módulo Apache mod_headers
  • Módulo Apache mod_heartbeat
  • Módulo Apache mod_heartmonitor
  • @@ -342,4 +342,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.fr b/docs/manual/sitemap.html.fr index afc46d8d007..aa1de9ee9cd 100644 --- a/docs/manual/sitemap.html.fr +++ b/docs/manual/sitemap.html.fr @@ -252,7 +252,7 @@ pour d
  • Module Apache mod_ext_filter
  • Module Apache mod_file_cache
  • Module Apache mod_filter
  • -
  • Module Apache mod_h2
  • +
  • Module Apache mod_http2
  • Module Apache mod_headers
  • Module Apache mod_heartbeat
  • Module Apache mod_heartmonitor
  • @@ -383,4 +383,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.ja.utf8 b/docs/manual/sitemap.html.ja.utf8 index e0e74e52bac..02f18fb3e19 100644 --- a/docs/manual/sitemap.html.ja.utf8 +++ b/docs/manual/sitemap.html.ja.utf8 @@ -218,7 +218,7 @@
  • Apache モジュール mod_ext_filter
  • Apache モジュール mod_file_cache
  • Apache モジュール mod_filter
  • -
  • Apache モジュール mod_h2
  • +
  • Apache モジュール mod_http2
  • Apache モジュール mod_headers
  • Apache モジュール mod_heartbeat
  • Apache モジュール mod_heartmonitor
  • @@ -342,4 +342,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.ko.euc-kr b/docs/manual/sitemap.html.ko.euc-kr index de5ba4a7059..289c2b00bd0 100644 --- a/docs/manual/sitemap.html.ko.euc-kr +++ b/docs/manual/sitemap.html.ko.euc-kr @@ -217,7 +217,7 @@
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_ext_filter
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_file_cache
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_filter
  • -
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_h2
  • +
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_http2
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_headers
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_heartbeat
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_heartmonitor
  • @@ -340,4 +340,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.tr.utf8 b/docs/manual/sitemap.html.tr.utf8 index d5e1dd99c64..9bc35618a7e 100644 --- a/docs/manual/sitemap.html.tr.utf8 +++ b/docs/manual/sitemap.html.tr.utf8 @@ -232,7 +232,7 @@ Windows ile Apache Kullanımı
  • Apache Modülü mod_ext_filter
  • Apache Modülü mod_file_cache
  • Apache Modülü mod_filter
  • -
  • Apache Modülü mod_h2
  • +
  • Apache Modülü mod_http2
  • Apache Modülü mod_headers
  • Apache Modülü mod_heartbeat
  • Apache Modülü mod_heartmonitor
  • @@ -357,4 +357,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/sitemap.html.zh-cn.utf8 b/docs/manual/sitemap.html.zh-cn.utf8 index 85123f2658b..f63b1238a4e 100644 --- a/docs/manual/sitemap.html.zh-cn.utf8 +++ b/docs/manual/sitemap.html.zh-cn.utf8 @@ -218,7 +218,7 @@
  • Apache 模块 mod_ext_filter
  • Apache 模块 mod_file_cache
  • Apache 模块 mod_filter
  • -
  • Apache 模块 mod_h2
  • +
  • Apache 模块 mod_http2
  • Apache 模块 mod_headers
  • Apache 模块 mod_heartbeat
  • Apache 模块 mod_heartmonitor
  • @@ -340,4 +340,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile index f625e7c2422..337d6f6dd73 100644 --- a/modules/NWGNUmakefile +++ b/modules/NWGNUmakefile @@ -5,7 +5,7 @@ # variable WITH_SSL=1 # To build with the mod_lua module set the environment # variable WITH_LUA=1 -# To build with the mod_h2 module set the environment +# To build with the mod_http2 module set the environment # variable WITH_HTTP2=1 # # Check if LDAP is enabled in APR-UTIL @@ -73,7 +73,7 @@ SUBDIRS += lua endif endif -# Allow the mod_h2 module to be built if WITH_HTTP2 is defined +# Allow the mod_http2 module to be built if WITH_HTTP2 is defined ifeq "$(WITH_HTTP2)" "1" ifneq "$(NGH2SRC)" "" SUBDIRS += http2 diff --git a/modules/http2/NWGNUmakefile b/modules/http2/NWGNUmakefile index cc08702b310..1ab6282db82 100644 --- a/modules/http2/NWGNUmakefile +++ b/modules/http2/NWGNUmakefile @@ -108,7 +108,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = mod_h2 +NLM_NAME = mod_http2 # # This is used by the link '-desc ' directive. @@ -230,7 +230,7 @@ FILES_nlm_Ximports = \ # Any symbols exported to here # FILES_nlm_exports = \ - h2_module \ + http2_module \ $(EOLIST) # diff --git a/modules/http2/README.h2 b/modules/http2/README.h2 index 803f787f9a1..399086b70b8 100644 --- a/modules/http2/README.h2 +++ b/modules/http2/README.h2 @@ -1,4 +1,4 @@ -The h2 module adds support for the HTTP/2 protocol to the server. +The http2 module adds support for the HTTP/2 protocol to the server. Specifically, it supports the protocols "h2" (HTTP2 over TLS) and "h2c" (HTTP2 over plain HTTP connections via Upgrade). Additionally it offers @@ -12,7 +12,7 @@ BUILD If you have libnghttp2 (https://nghttp2.org) installed on your system, simply add - --enable-h2 + --enable-http2 to your httpd ./configure invocation. Should libnghttp2 reside in a unusual location, add @@ -23,7 +23,7 @@ to ./configure. is expected to be the installation prefix, so there should be a /lib/libnghttp2.*. If your system support pkg-config, /lib/pkgconfig/libnghttp2.pc will be inspected. -If you want to link nghttp2 statically into the mod_h2 module, you may +If you want to link nghttp2 statically into the mod_http2 module, you may similarly to mod_ssl add --enable-nghttp2-staticlib-deps @@ -34,12 +34,12 @@ shared cousins. CONFIGURATION -If mod_h2 is enabled for a site or not depends on the new "Protocols" +If mod_http2 is enabled for a site or not depends on the new "Protocols" directive. This directive list all protocols enabled for a server or virtual host. If you do not specify "Protocols" all available protocols are enabled. For -sites using TLS, the protocol supported by mod_h2 is "h2". For cleartext +sites using TLS, the protocol supported by mod_http2 is "h2". For cleartext http:, the offered protocol is "h2c". The following is an example of a server that only supports http/1.1 in @@ -52,7 +52,7 @@ general and offers h2 for a specific virtual host. ... -Please see the documentation of mod_h2 for a complete list and explanation +Please see the documentation of mod_http2 for a complete list and explanation of all options. diff --git a/modules/http2/config.m4 b/modules/http2/config.m4 index 4da7d25362a..ad19373512d 100644 --- a/modules/http2/config.m4 +++ b/modules/http2/config.m4 @@ -17,8 +17,8 @@ dnl # start of module specific part APACHE_MODPATH_INIT(http2) dnl # list of module object files -h2_objs="dnl -mod_h2.lo dnl +http2_objs="dnl +mod_http2.lo dnl h2_alt_svc.lo dnl h2_config.lo dnl h2_conn.lo dnl @@ -90,7 +90,7 @@ AC_DEFUN(APACHE_CHECK_NGHTTP2,[ PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH fi - AC_ARG_ENABLE(nghttp2-staticlib-deps,APACHE_HELP_STRING(--enable-nghttp2-staticlib-deps,[link mod_h2 with dependencies of libnghttp2's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-http2.]), [ + AC_ARG_ENABLE(nghttp2-staticlib-deps,APACHE_HELP_STRING(--enable-nghttp2-staticlib-deps,[link mod_http2 with dependencies of libnghttp2's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-http2.]), [ if test "$enableval" = "yes"; then PKGCONFIG_LIBOPTS="--static" fi @@ -167,30 +167,17 @@ AC_DEFUN(APACHE_CHECK_NGHTTP2,[ ]) -dnl # hook module into the Autoconf mechanism (--enable-http2 or -dnl # --enabled-h2 option,) +dnl # hook module into the Autoconf mechanism (--enable-http2) APACHE_MODULE(http2, [HTTP/2 protocol handling in addition to HTTP protocol -handling. Implemented by mod_h2. This module requires a libnghttp2 installation. +handling. Implemented by mod_http2. This module requires a libnghttp2 installation. See --with-nghttp2 on how to manage non-standard locations. This module -is usually linked shared and requires loading. ], $h2_objs, , most, [ +is usually linked shared and requires loading. ], $http2_objs, , most, [ APACHE_CHECK_NGHTTP2 if test "$ac_cv_nghttp2" = "yes" ; then if test "x$enable_ssl" = "xshared"; then # The only symbol which needs to be exported is the module # structure, so ask libtool to hide everything else: - APR_ADDTO(MOD_H2_LDADD, [-export-symbols-regex h2_module]) - fi - else - enable_h2=no - fi -]) -APACHE_MODULE(h2, [HTTP/2 support (Deprecated. Use --enable-http2)], $h2_objs, , most, [ - APACHE_CHECK_NGHTTP2 - if test "$ac_cv_nghttp2" = "yes" ; then - if test "x$enable_ssl" = "xshared"; then - # The only symbol which needs to be exported is the module - # structure, so ask libtool to hide everything else: - APR_ADDTO(MOD_H2_LDADD, [-export-symbols-regex h2_module]) + APR_ADDTO(MOD_HTTP2_LDADD, [-export-symbols-regex http2_module]) fi else enable_h2=no diff --git a/modules/http2/h2_config.c b/modules/http2/h2_config.c index a370bd620c3..6db702eca80 100644 --- a/modules/http2/h2_config.c +++ b/modules/http2/h2_config.c @@ -178,7 +178,7 @@ int h2_config_geti(h2_config *conf, h2_config_var_t var) h2_config *h2_config_sget(server_rec *s) { h2_config *cfg = (h2_config *)ap_get_module_config(s->module_config, - &h2_module); + &http2_module); AP_DEBUG_ASSERT(cfg); return cfg; } @@ -365,7 +365,7 @@ const command_rec h2_cmds[] = { h2_config *h2_config_rget(request_rec *r) { h2_config *cfg = (h2_config *)ap_get_module_config(r->per_dir_config, - &h2_module); + &http2_module); return cfg? cfg : h2_config_sget(r->server); } diff --git a/modules/http2/h2_ctx.c b/modules/http2/h2_ctx.c index f37a1474a1e..422835c2df8 100644 --- a/modules/http2/h2_ctx.c +++ b/modules/http2/h2_ctx.c @@ -28,7 +28,7 @@ static h2_ctx *h2_ctx_create(const conn_rec *c) { h2_ctx *ctx = apr_pcalloc(c->pool, sizeof(h2_ctx)); AP_DEBUG_ASSERT(ctx); - ap_set_module_config(c->conn_config, &h2_module, ctx); + ap_set_module_config(c->conn_config, &http2_module, ctx); return ctx; } @@ -43,7 +43,7 @@ h2_ctx *h2_ctx_create_for(const conn_rec *c, h2_task_env *env) h2_ctx *h2_ctx_get(const conn_rec *c) { - h2_ctx *ctx = (h2_ctx*)ap_get_module_config(c->conn_config, &h2_module); + h2_ctx *ctx = (h2_ctx*)ap_get_module_config(c->conn_config, &http2_module); if (ctx == NULL) { ctx = h2_ctx_create(c); } @@ -57,7 +57,7 @@ h2_ctx *h2_ctx_rget(const request_rec *r) const char *h2_ctx_protocol_get(const conn_rec *c) { - h2_ctx *ctx = (h2_ctx*)ap_get_module_config(c->conn_config, &h2_module); + h2_ctx *ctx = (h2_ctx*)ap_get_module_config(c->conn_config, &http2_module); return ctx? ctx->protocol : NULL; } diff --git a/modules/http2/h2_private.h b/modules/http2/h2_private.h index 6931278401d..a6081fc6bbb 100644 --- a/modules/http2/h2_private.h +++ b/modules/http2/h2_private.h @@ -18,9 +18,9 @@ #include -extern module AP_MODULE_DECLARE_DATA h2_module; +extern module AP_MODULE_DECLARE_DATA http2_module; -APLOG_USE_MODULE(h2); +APLOG_USE_MODULE(http2); #define H2_HEADER_METHOD ":method" diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h index dc2ce2ea3a7..7ed711ffed0 100644 --- a/modules/http2/h2_version.h +++ b/modules/http2/h2_version.h @@ -20,7 +20,7 @@ * @macro * Version number of the h2 module as c string */ -#define MOD_H2_VERSION "0.9.9" +#define MOD_HTTP2_VERSION "0.9.9" /** * @macro @@ -28,7 +28,7 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define MOD_H2_VERSION_NUM 0x000909 +#define MOD_HTTP2_VERSION_NUM 0x000909 #endif /* mod_h2_h2_version_h */ diff --git a/modules/http2/mod_h2.c b/modules/http2/mod_http2.c similarity index 96% rename from modules/http2/mod_h2.c rename to modules/http2/mod_http2.c index 1c7cd2d8928..b1e79f16a57 100644 --- a/modules/http2/mod_h2.c +++ b/modules/http2/mod_http2.c @@ -37,7 +37,7 @@ static void h2_hooks(apr_pool_t *pool); -AP_DECLARE_MODULE(h2) = { +AP_DECLARE_MODULE(http2) = { STANDARD20_MODULE_STUFF, NULL, NULL, @@ -80,8 +80,8 @@ static int h2_post_config(apr_pool_t *p, apr_pool_t *plog, ngh2 = nghttp2_version(0); ap_log_error( APLOG_MARK, APLOG_INFO, 0, s, - "mod_h2 (v%s, nghttp2 %s), initializing...", - MOD_H2_VERSION, ngh2? ngh2->version_str : "unknown"); + "mod_http2 (v%s, nghttp2 %s), initializing...", + MOD_HTTP2_VERSION, ngh2? ngh2->version_str : "unknown"); switch (h2_conn_mpm_type()) { case H2_MPM_EVENT: diff --git a/modules/http2/mod_h2.dsp b/modules/http2/mod_http2.dsp similarity index 77% rename from modules/http2/mod_h2.dsp rename to modules/http2/mod_http2.dsp index 3d73f19513d..c3e139e9553 100644 --- a/modules/http2/mod_h2.dsp +++ b/modules/http2/mod_http2.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="mod_h2" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="mod_http2" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=mod_h2 - Win32 Release +CFG=mod_http2 - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "mod_h2.mak". +!MESSAGE NMAKE /f "mod_http2.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "mod_h2.mak" CFG="mod_h2 - Win32 Release" +!MESSAGE NMAKE /f "mod_http2.mak" CFG="mod_http2 - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_h2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_h2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_http2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_http2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "mod_h2 - Win32 Release" +!IF "$(CFG)" == "mod_http2 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -43,25 +43,25 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ssize_t=long" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ssize_t=long" /Fd"Release\mod_h2_src" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ssize_t=long" /Fd"Release\mod_http2_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /fo"Release/mod_h2.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_h2.so" /d LONG_NAME="http2_module for Apache" +# ADD RSC /l 0x409 /fo"Release/mod_http2.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_http2.so" /d LONG_NAME="http2_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /out:".\Release\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so -# ADD LINK32 kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Release\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so /opt:ref +# ADD BASE LINK32 kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /out:".\Release\mod_http2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_http2.so +# ADD LINK32 kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Release\mod_http2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_http2.so /opt:ref # Begin Special Build Tool -TargetPath=.\Release\mod_h2.so +TargetPath=.\Release\mod_http2.so SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool -!ELSEIF "$(CFG)" == "mod_h2 - Win32 Debug" +!ELSEIF "$(CFG)" == "mod_http2 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -75,19 +75,19 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ssize_t=long" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ssize_t=long" /Fd"Debug\mod_h2_src" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ssize_t=long" /Fd"Debug\mod_http2_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /fo"Debug/mod_h2.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_h2.so" /d LONG_NAME="http2_module for Apache" +# ADD RSC /l 0x409 /fo"Debug/mod_http2.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_http2.so" /d LONG_NAME="http2_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Debug\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so -# ADD LINK32 kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Debug\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so +# ADD BASE LINK32 kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Debug\mod_http2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_http2.so +# ADD LINK32 kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Debug\mod_http2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_http2.so # Begin Special Build Tool -TargetPath=.\Debug\mod_h2.so +TargetPath=.\Debug\mod_http2.so SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 @@ -97,8 +97,8 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # Begin Target -# Name "mod_h2 - Win32 Release" -# Name "mod_h2 - Win32 Debug" +# Name "mod_http2 - Win32 Release" +# Name "mod_http2 - Win32 Debug" # Begin Source File SOURCE=./h2_alt_svc.c @@ -197,7 +197,7 @@ SOURCE=./h2_workers.c # End Source File # Begin Source File -SOURCE=./mod_h2.c +SOURCE=./mod_http2.c # End Source File # Begin Source File diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 5fa19bdd1ef..ca16be894d8 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -127,4 +127,4 @@ mod_optional_fn_import.so 0x70BC0000 0x00010000 mod_optional_hook_export.so 0x70BD0000 0x00010000 mod_optional_hook_import.so 0x70BE0000 0x00010000 mod_authnz_fcgi.so 0x70BF0000 0x00020000 -mod_h2.so 0x70C10000 0x00020000 +mod_http2.so 0x70C10000 0x00020000