From: Rainer Jung <rjung@apache.org>
Date: Thu, 13 May 2010 13:47:34 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.0.64~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f807c6165f412a2e22175e3c397e0a27f84d87d8;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index 02585dcb879..ccc3286b7ad 100644
--- a/STATUS
+++ b/STATUS
@@ -125,6 +125,22 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~fuankg/diffs/httpd-2.0.x-ap_vhost_iterate_given_conn.diff
     +1: fuankg, wrowe, pgollucci
 
+  * mod_proxy_ftp, CVE-2009-3095, sanity check authn credentials
+    Patch in 2.2.x branch:
+      http://svn.apache.org/viewvc?view=revision&revision=814847
+    Backport:
+      http://people.apache.org/~trawick/CVE-2009-3095-2.0.txt
+    +1: pgollucci, poirier, rjung
+      PG: whomever proposed this should vote for it
+
+  * core output filter, CVE-2009-1891, consuming CPU after client disconnects
+    Patch in 2.2.x branch:
+      http://svn.apache.org/viewvc?view=revision&revision=791454
+    Dan's patch posted last year for 2.0.x:
+      http://people.apache.org/~trawick/CVE-2009-1891-2.0-poirier.txt
+    +1: pgollucci, poirier, rjung
+      PG: whomever proposed this should vote for it
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
@@ -200,22 +216,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: pgollucci, poirier
       PG: whomever proposed this should vote for it
 
-  * mod_proxy_ftp, CVE-2009-3095, sanity check authn credentials
-    Patch in 2.2.x branch:
-      http://svn.apache.org/viewvc?view=revision&revision=814847
-    Backport:
-      http://people.apache.org/~trawick/CVE-2009-3095-2.0.txt
-    +1: pgollucci, poirier, rjung
-      PG: whomever proposed this should vote for it
-
-  * core output filter, CVE-2009-1891, consuming CPU after client disconnects
-    Patch in 2.2.x branch:
-      http://svn.apache.org/viewvc?view=revision&revision=791454
-    Dan's patch posted last year for 2.0.x:
-      http://people.apache.org/~trawick/CVE-2009-1891-2.0-poirier.txt
-    +1: pgollucci, poirier, rjung
-      PG: whomever proposed this should vote for it
-
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.