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 4181e165c04012f1b33d33d1055e5b34b731549d..339c44d74aee8baaa18c231e4f0d9dc931f805bd 100644 (file)
--- 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 a92f2ea458802415ac5068f5bf6e9ce4fb470948..5cf16dd64b31075c537224b5d0f4737a0e1fb0cb 100644 (file)
--- 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>