svn commit: r1528556 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_rewrite.c

[ji...@apache.org]

Author: jim
Date: Wed Oct  2 16:38:39 2013
New Revision: 1528556

URL: http://svn.apache.org/r1528556
Log:
  *) mod_rewrite: Make rewrite websocket aware to allow proxying.
     PR 55598. [Chris Harris <chris.harris kitware com>]

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1528556&r1=1528555&r2=1528556&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Oct  2 16:38:39 2013
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) 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/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=1528556&r1=1528555&r2=1528556&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Wed Oct  2 16:38:39 2013
@@ -589,6 +589,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;