From 5c10e9694b9badf3decc13eae0c35c67411306f5 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Mon, 7 Oct 2013 19:12:57 +0000 Subject: [PATCH] Merge r1528556 from trunk: *) mod_rewrite: Make rewrite websocket aware to allow proxying. PR 55598. [Chris Harris ] Submitted By: [Chris Harris 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 --- CHANGES | 3 +++ STATUS | 5 ----- modules/mappers/mod_rewrite.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index ef7347f96b..34becc03ef 100644 --- 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 ] + *) mod_ldap: When looking up sub-groups, use an implicit objectClass=* instead of an explicit cn=* filter. [David Hawes ] diff --git a/STATUS b/STATUS index 30ccb3e260..508713b02b 100644 --- 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 a7ac2134b8..0ac4dc9d6a 100644 --- 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; -- 2.40.0