Merge r1528556 from trunk:

  *) mod_rewrite: Make rewrite websocket aware to allow proxying.
     PR 55598. [Chris Harris <chris.harris kitware com>]

Submitted By: [Chris Harris <chris.harris kitware com>
Reviewed By: jim, rjung, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1530032 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ef7347f96bc9cca9bbe3be803d7e0de816f866b5..34becc03ef525db7a706e830b817bbca584042e4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.7
 
+  *) mod_rewrite: Make rewrite websocket aware to allow proxying.
+     PR 55598. [Chris Harris <chris.harris kitware com>]
+
   *) mod_ldap: When looking up sub-groups, use an implicit objectClass=*
      instead of an explicit cn=* filter. [David Hawes <dhawes vt.edu>]
 

diff --git a/STATUS b/STATUS
index 30ccb3e26038b351d4f9cf07899b3acd77429fb4..508713b02b3308f761d074046a4fc3bf20fe5bda 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -97,11 +97,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_rewrite: Close 55598. Make mod_rewrite websocket aware to allow
-    it to proxy requests.
-    trunk patches: https://svn.apache.org/r1528556
-    2.4.x: trunk works modulo CHANGES
-    +1: jim, rjung, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index a7ac2134b84702ae4134dd7188527fb5014e9724..0ac4dc9d6a0dfcb00fa09f762e928c299f5690cb 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -585,6 +585,18 @@ static unsigned is_absolute_uri(char *uri, int *supportsqs)
             return 7;
         }
         break;
+
+    case 'w':
+    case 'W':
+        if (!strncasecmp(uri, "s://", 4)) {        /* ws://     */
+            *sqs = 1;
+            return 5;
+        }
+        else if (!strncasecmp(uri, "ss://", 5)) {  /* wss://    */
+            *sqs = 1;
+            return 6;
+        }
+        break;
     }
 
     return 0;