diff options
author | Yann Ylavic <ylavic@apache.org> | 2023-01-27 16:50:06 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2023-01-27 16:50:06 +0000 |
commit | 61513af0b28829d2ac9d757466f9b2913a8e9dce (patch) | |
tree | 39c588444c854c9f37bfbd4f1a93cc214e6b9233 /docs | |
parent | 64a17319f9dbdd0f20c3e605cff76e76903a182d (diff) | |
download | httpd-61513af0b28829d2ac9d757466f9b2913a8e9dce.tar.gz |
docs xforms [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907036 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r-- | docs/manual/mod/mod_proxy.html.en.utf8 | 36 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.html.fr.utf8 | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_wstunnel.html.en.utf8 | 9 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_wstunnel.html.fr.utf8 | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_wstunnel.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_wstunnel.xml.meta | 2 |
9 files changed, 36 insertions, 23 deletions
diff --git a/docs/manual/mod/mod_proxy.html.en.utf8 b/docs/manual/mod/mod_proxy.html.en.utf8 index fb4b4656f5..b5630ed4c4 100644 --- a/docs/manual/mod/mod_proxy.html.en.utf8 +++ b/docs/manual/mod/mod_proxy.html.en.utf8 @@ -219,6 +219,8 @@ ProxyVia On Require host internal.example.com </Proxy></pre> </div> + <div class="example"><h3><a id="wsupgrade" name="wsupgrade">Websocket Upgrade (2.4.47 and later)</a></h3><pre class="prettyprint lang-config">ProxyPass "/some/ws/capable/path/" "http://example.com/some/ws/capable/path/" upgrade=websocket</pre> +</div> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> <h2><a name="handler" id="handler">Access via Handler</a> <a title="Permanent link" href="#handler" class="permalink">¶</a></h2> @@ -1657,23 +1659,23 @@ ProxyPassReverse "/mirror/foo/" "https://backend.example.com/"</pre> <div class="note"><h3><a id="protoupgrade" name="protoupgrade">Protocol Upgrade</a></h3> - <p>Since Apache HTTP Server 2.4.47, protocol Upgrade (tunneling) can be handled - end-to-end by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> using the <code class="directive">ProxyPass</code> - parameter <var><a href="#upgrade">upgrade</a></var>.</p> - <p>End-to-end means that the HTTP Upgrade request from the client/browser is first - forwarded by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> to the origin server and the connection - will be upgraded (and tunneled by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>) only if the origin - server accepts/initiates the upgrade (HTTP response <code>101 Switching Protocols</code>). - If the origin server responds with anything else <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> - will continue forwarding (and enforcing) the HTTP protocol as usual for this - connection.</p> - <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ProxyPass "/some/http/or/ws/path/" "http://example.com/some/http/or/ws/path/" upgrade=websocket</pre> -</div> - <p>For Apache HTTP Server 2.4.46 and earlier (or if - <code class="directive"><a href="../mod/mod_proxy_wstunnel.html#proxywebsocketfallbacktoproxyhttp">ProxyWebsocketFallbackToProxyHttp</a></code> - from 2.4.48 and later disables <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> handling), see the - documentation of <code class="module"><a href="../mod/mod_proxy_wstunnel.html">mod_proxy_wstunnel</a></code> for how to proxy the WebSocket - protocol.</p> + <p>Since Apache HTTP Server 2.4.47, protocol Upgrade (tunneling) can be handled + end-to-end by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> using the <code class="directive">ProxyPass</code> + parameter <var><a href="#upgrade">upgrade</a></var>.</p> + <p>End-to-end means that the HTTP Upgrade request from the client/browser is first + forwarded by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> to the origin server and the connection + will be upgraded (and tunneled by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>) only if the origin + server accepts/initiates the upgrade (HTTP response <code>101 Switching Protocols</code>). + If the origin server responds with anything else <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> + will continue forwarding (and enforcing) the HTTP protocol as usual for this + connection.</p> + <p>See <a href="#wsupgrade">Websocket Upgrade (2.4.47 and later)</a> for an example of + configuration using <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>.</p> + <p>For Apache HTTP Server 2.4.46 and earlier (or if + <code class="directive"><a href="../mod/mod_proxy_wstunnel.html#proxywebsocketfallbacktoproxyhttp">ProxyWebsocketFallbackToProxyHttp</a></code> + from 2.4.48 and later disables <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> handling), see the + documentation of <code class="module"><a href="../mod/mod_proxy_wstunnel.html">mod_proxy_wstunnel</a></code> for how to proxy the WebSocket + protocol.</p> </div> </div> diff --git a/docs/manual/mod/mod_proxy.html.fr.utf8 b/docs/manual/mod/mod_proxy.html.fr.utf8 index b0950296e5..597b436253 100644 --- a/docs/manual/mod/mod_proxy.html.fr.utf8 +++ b/docs/manual/mod/mod_proxy.html.fr.utf8 @@ -30,6 +30,8 @@ <a href="../fr/mod/mod_proxy.html" title="Français"> fr </a> | <a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a></p> </div> +<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.</div> <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Serveur mandataire/passerelle multi-protocole</td></tr> <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr> <tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>proxy_module</td></tr> diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index d991b19026..cf8f873c33 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1904804 --> +<!-- English Revision: 1904804:1907035 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 1b97195412..01d47edcab 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 344971:1904804 (outdated) --> +<!-- English Revision: 344971:1907035 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta index 38a79fdda7..f0185375d4 100644 --- a/docs/manual/mod/mod_proxy.xml.meta +++ b/docs/manual/mod/mod_proxy.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> </variants> </metafile> diff --git a/docs/manual/mod/mod_proxy_wstunnel.html.en.utf8 b/docs/manual/mod/mod_proxy_wstunnel.html.en.utf8 index 3d072cce06..cf89de9b5d 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.html.en.utf8 +++ b/docs/manual/mod/mod_proxy_wstunnel.html.en.utf8 @@ -37,7 +37,8 @@ <tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.4.5 and later</td></tr></table> <h3>Summary</h3> - <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. It provides support for the tunnelling of web + <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. + It provides support for the tunnelling of web socket connections to a backend websockets server. The connection is automatically upgraded to a websocket connection:</p> @@ -67,6 +68,12 @@ directive to allow the module to accept other protocol. NONE means you bypass the check for the header but still upgrade to WebSocket. ANY means that <code>Upgrade</code> will read in the request headers and use in the response <code>Upgrade</code></p> + + <div class="warning"><h3><a id="deprecation" name="deprecation">Deprecation</a></h3> + <p>Since Apache HTTP Server 2.4.47, protocol Upgrade (tunneling) can be better handled by + <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>.</p> + <p>See <a href="mod_proxy.html#protoupgrade">Protocol Upgrade</a>.</p> + </div> </div> <div id="quickview"><h3 class="directives">Directives</h3> <ul id="toc"> diff --git a/docs/manual/mod/mod_proxy_wstunnel.html.fr.utf8 b/docs/manual/mod/mod_proxy_wstunnel.html.fr.utf8 index a5fc74b7e7..6f37723c0e 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.html.fr.utf8 +++ b/docs/manual/mod/mod_proxy_wstunnel.html.fr.utf8 @@ -29,6 +29,8 @@ <p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy_wstunnel.html" hreflang="en" rel="alternate" title="English"> en </a> | <a href="../fr/mod/mod_proxy_wstunnel.html" title="Français"> fr </a></p> </div> +<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.</div> <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Module pour <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> supportant les websockets</td></tr> <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr> diff --git a/docs/manual/mod/mod_proxy_wstunnel.xml.fr b/docs/manual/mod/mod_proxy_wstunnel.xml.fr index 59d219c598..a1b559b459 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.xml.fr +++ b/docs/manual/mod/mod_proxy_wstunnel.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision : 1890110 --> +<!-- English Revision: 1890110:1907035 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- diff --git a/docs/manual/mod/mod_proxy_wstunnel.xml.meta b/docs/manual/mod/mod_proxy_wstunnel.xml.meta index 6c0a516e2a..b54b72811c 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.xml.meta +++ b/docs/manual/mod/mod_proxy_wstunnel.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> |