promote approved backport

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

diff --git a/STATUS b/STATUS
index 6c3d39210ad7b17fc745b36ca40214cfdf1169c8..92d4cbba3a1296728a9a56d3646b3efb333310b8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -83,6 +83,15 @@ 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 ]
 
@@ -122,14 +131,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
    +1: rpluem, niq
 
- * mod_rewrite: Preserve the query string when [proxy,noescape]. PR 45247.
-   Caused by r649840/trunk, r663593/2.2.x
-   Trunk version of patches:
-        http://svn.apache.org/viewvc?view=rev&revision=670061
-   Backport version for 2.2.x of updated patch:
-        http://people.apache.org/~tdonovan/diffs/mod_rewrite_proxy_esc_2.2.x.diff
-   +1: rpluem, niq
-
  * core, authn/z: Avoid calling access control hooks for internal requests
    with configurations which match those of initial request.  Revert to
    original behaviour (call access control hooks for internal requests