diff options
| author | Rainer Jung <rjung@apache.org> | 2016-01-01 21:15:00 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-01-01 21:15:00 +0000 |
| commit | deaf36d8795da46aa251a033aad06cfaa2b59c73 (patch) | |
| tree | 5d7132b36b9e62bfc9a7f542779e78510018fe42 /docs/manual/mod/mod_http2.html.en | |
| parent | a35dbc4e613244fc326c88728f3ffd47b8f61c03 (diff) | |
| download | httpd-deaf36d8795da46aa251a033aad06cfaa2b59c73.tar.gz | |
Update XForms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722582 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/mod/mod_http2.html.en')
| -rw-r--r-- | docs/manual/mod/mod_http2.html.en | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en index 9ea97878d0..333b1c9f57 100644 --- a/docs/manual/mod/mod_http2.html.en +++ b/docs/manual/mod/mod_http2.html.en @@ -150,7 +150,6 @@ <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Timeout (in seconds) for idle HTTP/2 connections</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>H2KeepAliveTimeout seconds</code></td></tr> -<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>H2KeepAliveTimeout 300</code></td></tr> <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_http2</td></tr> @@ -168,7 +167,9 @@ idle when no streams are open, e.g. no requests are ongoing. </p> <p> - A value of 0 enforces no timeout. + By default, for non-async MPMs (prefork, worker) the keepalive timeout + will be the same as H2Timeout. For async MPMs, the keepalive handling for + HTTP/1 connections applies as no special action is taken. </p> </div> @@ -555,7 +556,7 @@ H2PushPriority text/css interleaved # weight 256 default</pre> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Timeout (in seconds) for idle HTTP/2 connections</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>H2StreamTimeout seconds</code></td></tr> -<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>H2StreamTimeout 120</code></td></tr> +<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>H2StreamTimeout 0</code></td></tr> <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_http2</td></tr> @@ -787,7 +788,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/mod/mod_http2.html } })(window, document); //--><!]]></script></div><div id="footer"> -<p class="apache">Copyright 2015 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> +<p class="apache">Copyright 2016 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/quickreference.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!-- if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); |