Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 52520 invoked from network); 8 Aug 2008 03:10:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Aug 2008 03:10:29 -0000 Received: (qmail 683 invoked by uid 500); 8 Aug 2008 03:10:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 618 invoked by uid 500); 8 Aug 2008 03:10:28 -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 609 invoked by uid 99); 8 Aug 2008 03:10:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Aug 2008 20:10:28 -0700 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; Fri, 08 Aug 2008 03:09:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12B0F238898B; Thu, 7 Aug 2008 20:09:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r683813 - /httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c Date: Fri, 08 Aug 2008 03:09:37 -0000 To: cvs@httpd.apache.org From: tdonovan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080808030938.12B0F238898B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tdonovan Date: Thu Aug 7 20:09:37 2008 New Revision: 683813 URL: http://svn.apache.org/viewvc?rev=683813&view=rev Log: Merge r670061 (original fix), r670198 (correction), and r670254 (formatting) from trunk: * mod_rewrite: Preserve the query string when [proxy,noescape] PR 45247 Submitted by: tdonovan Reviewed by: rpluem, niq, tdonovan Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c 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=683813&r1=683812&r2=683813&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 Thu Aug 7 20:09:37 2008 @@ -4318,8 +4318,9 @@ r->filename = apr_pstrcat(r->pool, r->filename, r->path_info, NULL); } - if (r->args != NULL && - r->uri == r->unparsed_uri) { + if ((r->args != NULL) + && ((r->proxyreq == PROXYREQ_PROXY) + || (rulestatus == ACTION_NOESCAPE))) { /* see proxy_http:proxy_http_canon() */ r->filename = apr_pstrcat(r->pool, r->filename, "?", r->args, NULL);