Commit 18f71d96 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent 84d84a50

docs/manual/mod/mod_proxy_http2.html.en

+10 −2
Original line number Diff line number Diff line
@@ -94,11 +94,19 @@ 
    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">

docs/manual/mod/mod_proxy_http2.xml

+10 −2
Original line number Diff line number Diff line
@@ -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>