Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 34215 invoked from network); 2 Nov 2009 21:59:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Nov 2009 21:59:37 -0000 Received: (qmail 90096 invoked by uid 500); 2 Nov 2009 21:59:36 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 89986 invoked by uid 500); 2 Nov 2009 21:59:36 -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 89977 invoked by uid 99); 2 Nov 2009 21:59:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2009 21:59:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 02 Nov 2009 21:59:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A56E2388898; Mon, 2 Nov 2009 21:59:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832124 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/mappers/mod_rewrite.c Date: Mon, 02 Nov 2009 21:59:04 -0000 To: cvs@httpd.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091102215905.0A56E2388898@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Mon Nov 2 21:59:04 2009 New Revision: 832124 URL: http://svn.apache.org/viewvc?rev=832124&view=rev Log: Merge r822004 from trunk: mod_rewrite: Make sure that a hostname:port isn't fully qualified if the request is a CONNECT request. Submitted by: Bill Zajac Reviewed by: sf, minfrin, covener Modified: httpd/httpd/branches/2.2.x/CHANGES httpd/httpd/branches/2.2.x/STATUS httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c Modified: httpd/httpd/branches/2.2.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=832124&r1=832123&r2=832124&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Nov 2 21:59:04 2009 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.15 + *) mod_rewrite: Make sure that a hostname:port isn't fully qualified if + the request is a CONNECT request. [Bill Zajac ] + *) mod_cache: correctly consider s-maxage in cacheability decisions. [Dan Poirier] Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=832124&r1=832123&r2=832124&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Mon Nov 2 21:59:04 2009 @@ -87,11 +87,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_rewrite: don't fully qualify hostname:port if the request is a CONNECT - request - Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=822004 - 2.2.x Patch: trunk patch works - +1: sf, minfrin, covener PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c?rev=832124&r1=832123&r2=832124&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c (original) +++ httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c Mon Nov 2 21:59:04 2009 @@ -845,7 +845,10 @@ */ static void fully_qualify_uri(request_rec *r) { - if (!is_absolute_uri(r->filename)) { + if (r->method_number == M_CONNECT) { + return; + } + else if (!is_absolute_uri(r->filename)) { const char *thisserver; char *thisport; int port;