From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 20 Feb 2017 08:46:34 +0000 (+0000)
Subject: Merge r1783722, r1783723 from trunk:
X-Git-Tag: 2.4.26~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ee9045a0dd8abe400b86f9c5f4404ced9f491f5;p=apache

Merge r1783722, r1783723 from trunk:

Fix ProxyPassReverse schemes in mod_proxy_http2's doc (examples).

build doc.


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

diff --git a/docs/manual/mod/mod_proxy_http2.html.en b/docs/manual/mod/mod_proxy_http2.html.en
index 4181e165c0..339c44d74a 100644
--- a/docs/manual/mod/mod_proxy_http2.html.en
+++ b/docs/manual/mod/mod_proxy_http2.html.en
@@ -94,12 +94,20 @@
     backend connections for a reverse proxy. </p>
 
     <div class="example"><h3>HTTP/2 (TLS)</h3><pre class="prettyprint lang-config">ProxyPass "/app" "h2://app.example.com"
-ProxyPassReverse "/app" "h2://app.example.com"</pre>
+ProxyPassReverse "/app" "https://app.example.com"</pre>
 </div>
 
     <div class="example"><h3>HTTP/2 (cleartext)</h3><pre class="prettyprint lang-config">ProxyPass "/app" "h2c://app.example.com"
-ProxyPassReverse "/app" "h2c://app.example.com"</pre>
+ProxyPassReverse "/app" "http://app.example.com"</pre>
 </div>
+
+    <div class="note">
+      <p>The schemes to configure above in
+      <code class="directive">ProxyPassReverse</code> for reverse proxying
+      <code>h2</code> (or <code>h2c</code>) protocols are the usual
+      <code>https</code> (resp. <code>http</code>) as expected/used by
+      the user agent.</p>
+    </div>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="notes" id="notes">Request notes</a></h2>
diff --git a/docs/manual/mod/mod_proxy_http2.xml b/docs/manual/mod/mod_proxy_http2.xml
index a92f2ea458..5cf16dd64b 100644
--- a/docs/manual/mod/mod_proxy_http2.xml
+++ b/docs/manual/mod/mod_proxy_http2.xml
@@ -82,16 +82,24 @@
     <example><title>HTTP/2 (TLS)</title>
     <highlight language="config">
 ProxyPass "/app" "h2://app.example.com"
-ProxyPassReverse "/app" "h2://app.example.com"
+ProxyPassReverse "/app" "https://app.example.com"
     </highlight>
     </example>
 
     <example><title>HTTP/2 (cleartext)</title>
     <highlight language="config">
 ProxyPass "/app" "h2c://app.example.com"
-ProxyPassReverse "/app" "h2c://app.example.com"
+ProxyPassReverse "/app" "http://app.example.com"
     </highlight>
     </example>
+
+    <note>
+      <p>The schemes to configure above in
+      <directive>ProxyPassReverse</directive> for reverse proxying
+      <code>h2</code> (or <code>h2c</code>) protocols are the usual
+      <code>https</code> (resp. <code>http</code>) as expected/used by
+      the user agent.</p>
+    </note>
     </section> <!-- /examples -->
 
 <section id="notes"><title>Request notes</title>