From: Graham Leggett <minfrin@apache.org>
Date: Wed, 24 Jun 2015 16:15:33 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.2.30~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf02ec0a89151511a78278844e398eeb04f4803e;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 8a0314b6282..cb42e964915 100644
--- a/STATUS
+++ b/STATUS
@@ -97,6 +97,10 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
+
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
   *) SECURITY: CVE-2015-3183 (cve.mitre.org)
      core: Fix chunk header parsing defect.
      Remove apr_brigade_flatten(), buffering and duplicated code from
@@ -115,7 +119,7 @@ RELEASE SHOWSTOPPERS:
     http://svn.apache.org/r1684515
   2.2.x branch
     http://people.apache.org/~wrowe/httpd-2.2.x-ap_http_filter-chunked-v6.patch
-  +1: ylavic, wrowe
+  +1: ylavic, wrowe, minfrin
   jim notes: test framework errors due to 413->400 error change [test adjusted]
   wrowe notes: r1684513 was not neglected in this patch, already included
 
@@ -129,16 +133,11 @@ RELEASE SHOWSTOPPERS:
                      (trunk works but CHANGES entry in the above patch is
                       better since the APLOG_INFO part is already included
                       in the CVE-2015-3183 patch)
-     +1: ylavic, wrowe
+     +1: ylavic, wrowe, minfrin
      ylavic: CVE-2015-3183 patch httpd-2.2.x-ap_http_filter-chunked-v6.patch
              above must be applied first.
 
 
-PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
-  [ start all new proposals below, under PATCHES PROPOSED. ]
-
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]