Backport r611134: Don't canonicalise URLs with [P,NE] in mod_rewrite

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@611414 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 05685a691636e9fd38bda92fd9052dc72fddc82b..1575262a205ece45e39e7de44d4dcbe52fdf285e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) mod_rewrite: Don't canonicalise URLs with [P,NE]
+     PR 43319 [<rahul sun.com>]
 
 Changes with Apache 2.2.8
 

diff --git a/STATUS b/STATUS
index 4d49e6c9f3f850a6e107e559f20761bec03cb0c0..1defd875b65356ecb1381c42c1ef083195a2e7db 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -80,11 +80,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_rewrite: Don't canonicalise URLs with [P,NE]
-    PR 43319
-    http://svn.apache.org/viewvc?rev=611134&view=rev
-    +1: niq, rpluem, 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 e4d0e5d8e30968f21a7c10bb5c0b90b15510a5a3..b3f8bdc75a7274f4cbe1ce38bb10d6e1da8bbb2c 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4287,6 +4287,10 @@ static int hook_uri2file(request_rec *r)
                 return HTTP_FORBIDDEN;
             }
 
+            if (rulestatus == ACTION_NOESCAPE) {
+                apr_table_setn(r->notes, "proxy-nocanon", "1");
+            }
+
             /* make sure the QUERY_STRING and
              * PATH_INFO parts get incorporated
              */