svn commit: r1530032 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS modules/mappers/mod_rewrite.c

[co...@apache.org]

Author: covener
Date: Mon Oct  7 19:12:57 2013
New Revision: 1530032

URL: http://svn.apache.org/r1530032
Log:
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


Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1530032&r1=1530031&r2=1530032&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Oct  7 19:12:57 2013
@@ -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>]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1530032&r1=1530031&r2=1530032&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct  7 19:12:57 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1530032&r1=1530031&r2=1530032&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Mon Oct  7 19:12:57 2013
@@ -585,6 +585,18 @@ static unsigned is_absolute_uri(char *ur
             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;