From: Eric Covener <covener@apache.org>
Date: Sun, 9 Aug 2020 16:56:43 +0000 (+0000)
Subject: cover overlapp scenario which is straightfoward in trunk
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28f428aec8175ff097f5088e6f9ba58ed9fbb040;p=thirdparty%2Fapache%2Fhttpd.git

cover overlapp scenario which is straightfoward in trunk

(as long you get it in the right order)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1880719 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy_wstunnel.xml b/docs/manual/mod/mod_proxy_wstunnel.xml
index 111adfc81ef..c10ff2e6fef 100644
--- a/docs/manual/mod/mod_proxy_wstunnel.xml
+++ b/docs/manual/mod/mod_proxy_wstunnel.xml
@@ -49,6 +49,15 @@ Connection: Upgrade
 ProxyPass "/ws2/"  "ws://echo.websocket.org/"
 ProxyPass "/wss2/" "wss://echo.websocket.org/"
     </highlight>
+    
+<p>Proxying both HTTP and websockets at the same time can be done by specifying the websockets
+<directive type="ProxyPass" module="mod_proxy">ProxyPass</directive> directive before the 
+    HTTP directive:</p>
+    <highlight language="config">
+ProxyPass "/myApp/"  "ws://backend.example.com/
+ProxyPass "/myApp/"  "http://backend.example.com/
+    </highlight>
+
 
 <p>Load balancing for multiple backends can be achieved using <module>mod_proxy_balancer</module>.</p>