From: Jim Jagielski <jim@apache.org>
Date: Mon, 29 Aug 2011 15:30:53 +0000 (+0000)
Subject: enough votes... promote
X-Git-Tag: 2.2.20~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7912ffd1f28b2bb82c699c8ec820f6592f547b3b;p=thirdparty%2Fapache%2Fhttpd.git

enough votes... promote


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

diff --git a/STATUS b/STATUS
index 9d635d67e7e..68551974b38 100644
--- a/STATUS
+++ b/STATUS
@@ -92,6 +92,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core: Fix CVE-2011-3192
+    Trunk patch: All changes to modules/http/byterange_filter.c from r1161534 to
+                 r1162687.
+    2.2.x patch: http://people.apache.org/~sf/CVE-2011-3192_2.2.diff
+    +1: sf, jim (with r1162669 and r1162687 added), rpluem
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -168,12 +174,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1151654
     2.2.x patch: http://people.apache.org/~druggeri/patches/httpd-2.2.19.AllowOverrideList.patch
 
-  * core: Fix CVE-2011-3192
-    Trunk patch: All changes to modules/http/byterange_filter.c from r1161534 to
-                 r1162687.
-    2.2.x patch: http://people.apache.org/~sf/CVE-2011-3192_2.2.diff
-    +1: sf, jim (with r1162669 and r1162687 added), rpluem
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of