From: Yann Ylavic Date: Fri, 27 Jan 2023 16:50:06 +0000 (+0000) Subject: docs xforms [skip ci] X-Git-Tag: 2.5.0-alpha2-ci-test-only~133 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61513af0b28829d2ac9d757466f9b2913a8e9dce;p=thirdparty%2Fapache%2Fhttpd.git docs xforms [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907036 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_proxy.html.en.utf8 b/docs/manual/mod/mod_proxy.html.en.utf8 index fb4b4656f5f..b5630ed4c4c 100644 --- a/docs/manual/mod/mod_proxy.html.en.utf8 +++ b/docs/manual/mod/mod_proxy.html.en.utf8 @@ -218,6 +218,8 @@ ProxyVia On <Proxy *> Require host internal.example.com </Proxy> + +

Websocket Upgrade (2.4.47 and later)

ProxyPass "/some/ws/capable/path/" "http://example.com/some/ws/capable/path/" upgrade=websocket
top
@@ -1657,23 +1659,23 @@ ProxyPassReverse "/mirror/foo/" "https://backend.example.com/"

Protocol Upgrade

-

Since Apache HTTP Server 2.4.47, protocol Upgrade (tunneling) can be handled - end-to-end by mod_proxy_http using the ProxyPass - parameter upgrade.

-

End-to-end means that the HTTP Upgrade request from the client/browser is first - forwarded by mod_proxy_http to the origin server and the connection - will be upgraded (and tunneled by mod_proxy_http) only if the origin - server accepts/initiates the upgrade (HTTP response 101 Switching Protocols). - If the origin server responds with anything else mod_proxy_http - will continue forwarding (and enforcing) the HTTP protocol as usual for this - connection.

-

Example

ProxyPass "/some/http/or/ws/path/" "http://example.com/some/http/or/ws/path/" upgrade=websocket
-
-

For Apache HTTP Server 2.4.46 and earlier (or if - ProxyWebsocketFallbackToProxyHttp - from 2.4.48 and later disables mod_proxy_http handling), see the - documentation of mod_proxy_wstunnel for how to proxy the WebSocket - protocol.

+

Since Apache HTTP Server 2.4.47, protocol Upgrade (tunneling) can be handled + end-to-end by mod_proxy_http using the ProxyPass + parameter upgrade.

+

End-to-end means that the HTTP Upgrade request from the client/browser is first + forwarded by mod_proxy_http to the origin server and the connection + will be upgraded (and tunneled by mod_proxy_http) only if the origin + server accepts/initiates the upgrade (HTTP response 101 Switching Protocols). + If the origin server responds with anything else mod_proxy_http + will continue forwarding (and enforcing) the HTTP protocol as usual for this + connection.

+

See Websocket Upgrade (2.4.47 and later) for an example of + configuration using mod_proxy_http.

+

For Apache HTTP Server 2.4.46 and earlier (or if + ProxyWebsocketFallbackToProxyHttp + from 2.4.48 and later disables mod_proxy_http handling), see the + documentation of mod_proxy_wstunnel for how to proxy the WebSocket + protocol.

diff --git a/docs/manual/mod/mod_proxy.html.fr.utf8 b/docs/manual/mod/mod_proxy.html.fr.utf8 index b0950296e50..597b436253c 100644 --- a/docs/manual/mod/mod_proxy.html.fr.utf8 +++ b/docs/manual/mod/mod_proxy.html.fr.utf8 @@ -30,6 +30,8 @@  fr  |  ja 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index d991b190269..cf8f873c33d 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 1b971954122..01d47edcab6 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + +
Description:Serveur mandataire/passerelle multi-protocole
Statut:Extension
Identificateur de Module:proxy_module