httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdono...@apache.org
Subject svn commit: r683813 - /httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c
Date Fri, 08 Aug 2008 03:09:37 GMT
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);



Mime
View raw message