From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 5 Jun 2008 12:40:49 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.9~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402c2b97b72722785a35bc67caebd174a873443d;p=thirdparty%2Fapache%2Fhttpd.git

* Promote


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

diff --git a/STATUS b/STATUS
index c2a8f3a2631..dd5261d4bac 100644
--- a/STATUS
+++ b/STATUS
@@ -84,6 +84,22 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_proxy_http, mod_proxy_ajp, mod_proxy_balancer: Make modules nocanon aware
+   and do not add the query string again in this case. PR 44803
+   [Jim Jagielski, Ruediger Pluem]
+    Trunk version of patch:
+       http://svn.apache.org/viewvc?rev=649169&view=rev
+       http://svn.apache.org/viewvc?rev=649239&view=rev
+       http://svn.apache.org/viewvc?rev=649840&view=rev
+       http://svn.apache.org/viewvc?rev=649922&view=rev
+       http://svn.apache.org/viewvc?rev=650026&view=rev
+       http://svn.apache.org/viewvc?rev=661452&view=rev
+       http://svn.apache.org/viewvc?rev=661459&view=rev
+    Backport version for 2.2.x of patch:
+       Trunk version of patch works
+       Rollup-patch for 2.2 available at:
+          http://people.apache.org/~jim/patches/nocanon-patch-2.2.txt
+    +1: rpluem, jim, jfclere
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -129,23 +145,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    -1: niq - strcasecmp(NULL, ...) when secure is not set
    rpluem: Good catch. Should be fixed by r660461.
 
- * mod_proxy_http, mod_proxy_ajp, mod_proxy_balancer: Make modules nocanon aware
-   and do not add the query string again in this case. PR 44803
-   [Jim Jagielski, Ruediger Pluem]
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=649169&view=rev
-       http://svn.apache.org/viewvc?rev=649239&view=rev
-       http://svn.apache.org/viewvc?rev=649840&view=rev
-       http://svn.apache.org/viewvc?rev=649922&view=rev
-       http://svn.apache.org/viewvc?rev=650026&view=rev
-       http://svn.apache.org/viewvc?rev=661452&view=rev
-       http://svn.apache.org/viewvc?rev=661459&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-       Rollup-patch for 2.2 available at:
-          http://people.apache.org/~jim/patches/nocanon-patch-2.2.txt
-    +1: rpluem, jim, jfclere
-
 PATCHES/ISSUES THAT ARE STALLED
 
    * beos MPM: Create pmain pool and run modules' child_init hooks when