Merge r670061 (original fix), r670198 (correction), and r670254 (formatting) from...

* mod_rewrite: Preserve the query string when [proxy,noescape]

PR 45247

Submitted by: tdonovan
Reviewed by: rpluem, niq, tdonovan

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

diff --git a/CHANGES b/CHANGES
index 21a7ccc5a21df4e5a28f88db7516b7e1288207cb..bab36c2007d82e254dad11a00d2bb43082d1d946 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@ Changes with Apache 2.2.10
      known HTTP/1.0 servers. Return 'Expectation failed' (417) instead.
      [Ruediger Pluem]
 
+  *) mod_rewrite: Preserve the query string when [proxy,noescape]. PR 45247.
+     [Tom Donovan]
+
 Changes with Apache 2.2.9
 
   *) SECURITY: CVE-2008-2364 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index 92d4cbba3a1296728a9a56d3646b3efb333310b8..8e21e60403d5201931b14127bbe86fdde1a0bbd5 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -83,15 +83,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_rewrite: Preserve the query string when [proxy,noescape]. PR 45247.
-   Caused by r649840/trunk, r663593/2.2.x
-   Trunk version of patches:
-        original:    http://svn.apache.org/viewvc?view=rev&revision=670061
-        correction:  http://svn.apache.org/viewvc?view=rev&revision=670198
-   Backport version for 2.2.x of updated patch (r670061 and 670198 combined):
-        http://people.apache.org/~tdonovan/diffs/mod_rewrite_proxy_esc_2.2.x.diff
-   +1: rpluem, niq, tdonovan
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]