Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4898210D02 for ; Mon, 7 Oct 2013 19:13:23 +0000 (UTC) Received: (qmail 25232 invoked by uid 500); 7 Oct 2013 19:13:21 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 25061 invoked by uid 500); 7 Oct 2013 19:13:20 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 25054 invoked by uid 99); 7 Oct 2013 19:13:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 19:13:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 19:13:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 041D42388831; Mon, 7 Oct 2013 19:12:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530032 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS modules/mappers/mod_rewrite.c Date: Mon, 07 Oct 2013 19:12:57 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131007191258.041D42388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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 ] Submitted By: [Chris Harris 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 ] + *) mod_ldap: When looking up sub-groups, use an implicit objectClass=* instead of an explicit cn=* filter. [David Hawes ] 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;