From: Eric Covener <covener@apache.org>
Date: Tue, 3 Jan 2012 23:12:57 +0000 (+0000)
Subject: vote&promote
X-Git-Tag: 2.2.22~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51eeb43a5cb1b7bb87d65deb4ce29ec04d20406f;p=thirdparty%2Fapache%2Fhttpd.git

vote&promote


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

diff --git a/STATUS b/STATUS
index 1fe0a907f10..dbd66b73b08 100644
--- a/STATUS
+++ b/STATUS
@@ -107,6 +107,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      and 2.4.x no longer support this version, see r1203491 and r1203495)
     +1: kbrand (non-binding), rjung, jorton
 
+  * mod_log_config: Fix segfault when logging Nameless, Valueless cookie. PR 52256
+      Trunk patch: http://svn.apache.org/viewvc?rev=1225380&view=rev
+      2.2.x patch: trunk patch works
+    +1: sf, gregames, covener
+
+  * core: Fix integer overflow in ap_pregsub. CVE-2011-3607
+      Trunk patch: http://svn.apache.org/viewvc?rev=1198940&view=rev
+      2.2.x patch: http://people.apache.org/~sf/CVE-2011-3607.diff
+    +1: sf, gregames, covener
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -159,16 +169,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: jorton
     trawick: http://mail-archives.apache.org/mod_mbox/httpd-dev/201112.mbox/%3CCAKUrXK4uwT%3DP1KtEziNqFdxXs%2BtyWvggzpL8x2u-Bbq8tZ-Zsw%40mail.gmail.com%3E
 
-  * mod_log_config: Fix segfault when logging Nameless, Valueless cookie. PR 52256
-      Trunk patch: http://svn.apache.org/viewvc?rev=1225380&view=rev
-      2.2.x patch: trunk patch works
-    +1: sf, gregames
-
-  * core: Fix integer overflow in ap_pregsub. CVE-2011-3607
-      Trunk patch: http://svn.apache.org/viewvc?rev=1198940&view=rev
-      2.2.x patch: http://people.apache.org/~sf/CVE-2011-3607.diff
-    +1: sf, gregames
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of