From: Jim Jagielski <jim@apache.org>
Date: Thu, 5 Jun 2008 09:56:56 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.9~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec4e0ed740f260ac69d18a568eb394b9dd185fc5;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index d55cde56768..df4c500def4 100644
--- a/STATUS
+++ b/STATUS
@@ -79,11 +79,19 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-
+  None
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * proxy_balancer: Prevent CSRF attacks against the balancer-manager
+   (CVE-2007-6420)
+   Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=661666
+   Backport version for 2.2.x of patch:
+         Trunk version of patch works (minus CHANGES conflict)
+    +1: jorton, jim, wrowe
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -143,14 +151,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
     +1: rpluem, jim
 
- * proxy_balancer: Prevent CSRF attacks against the balancer-manager
-   (CVE-2007-6420)
-   Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=661666
-   Backport version for 2.2.x of patch:
-         Trunk version of patch works (minus CHANGES conflict)
-    +1: jorton, jim, wrowe
-
 PATCHES/ISSUES THAT ARE STALLED
 
    * beos MPM: Create pmain pool and run modules' child_init hooks when