From: Luca Toscano <elukey@apache.org>
Date: Tue, 24 Jan 2017 09:56:19 +0000 (+0000)
Subject: Merge r1779578, r1779609 from trunk:
X-Git-Tag: 2.4.26~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c310b723219cdd49846fece5683b0370251cf499;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1779578, r1779609 from trunk:

Added more details to mod-proxy-http2's doc

Reworked mod-proxy-http2's documentation after Stefan's suggestions

Submitted by: elukey


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1780044 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy_http2.xml b/docs/manual/mod/mod_proxy_http2.xml
index d6bcae9aa24..a92f2ea4588 100644
--- a/docs/manual/mod/mod_proxy_http2.xml
+++ b/docs/manual/mod/mod_proxy_http2.xml
@@ -30,20 +30,28 @@
 <identifier>proxy_http2_module</identifier>
 
 <summary>
-    <p>This module <em>requires</em> the service of <module
-    >mod_proxy</module>. It provides the features used for
-    proxying HTTP/2 requests. <module>mod_proxy_http2</module>
-    supports HTTP/2 only. It does <em>not</em>
-    provide any downgrades to HTTP/1.1.</p>
+    <p><module>mod_proxy_http2</module>
+    supports HTTP/2 only, it does <em>not</em>
+    provide any downgrades to HTTP/1.1. This means that the backend
+    needs to support HTTP/2 because HTTP/1.1 will not be used instead.</p>
 
-    <p>Thus, in order to get the ability of handling HTTP/2 proxy requests,
+    <p>This module <em>requires</em> the service of <module
+    >mod_proxy</module>, so in order to get the ability of
+    handling HTTP/2 proxy requests,
     <module>mod_proxy</module> and <module>mod_proxy_http2</module>
-    have to be present in the server.</p>
-
-    <p><module>mod_proxy_http2</module> works with incoming requests
-    over HTTP/1.1 and HTTP/2 requests. If <module>mod_http2</module>
-    handles the frontend connection, requests against the same HTTP/2
-    backend are sent over a single connection, whenever possible.</p>
+    need to be both loaded by the server.</p>
+
+    <p><module>mod_proxy_http2</module> works with incoming fronted requests
+    using HTTP/1.1 or HTTP/2. In both cases, requests proxied
+    to the same backend are sent over a single TCP connection
+    whenever possible (namely when the connection can be re-used).</p>
+
+    <p>Caveat: there will be no attemp to consolidate multiple HTTP/1.1 
+    frontend requests (configured to be proxied to the same backend)
+    into HTTP/2 streams belonging to the same HTTP/2 request.
+    Each HTTP/1.1 frontend request will be proxied to the backend using
+    a separate HTTP/2 request (trying to re-use the same TCP connection
+    if possible).</p>
 
     <p>This module relies on <a href="http://nghttp2.org/">libnghttp2</a>
     to provide the core http/2 engine.</p>