From: Graham Leggett <minfrin@apache.org>
Date: Sat, 8 Dec 2012 22:54:59 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.4~361
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91f681858138ac0268cfe1280c7174ba8f9d84c9;p=apache

Vote and promote.


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

diff --git a/STATUS b/STATUS
index eaa51b7200..06971ccde2 100644
--- a/STATUS
+++ b/STATUS
@@ -91,6 +91,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * core: Make ap_regcomp() return AP_REG_ESPACE if out of memory.
+     Make ap_pregcomp() abort if out of memory. This raises the minimum
+     PCRE requirement to version 6.0, released in 2005.
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343109
+     2.4.x patch: trunk patch works
+     +1: jim, sf, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -215,13 +222,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jim, druggeri
      druggeri note: Docs notes on new elements would be nice for quick reference
 
-   * core: Make ap_regcomp() return AP_REG_ESPACE if out of memory.
-     Make ap_pregcomp() abort if out of memory. This raises the minimum
-     PCRE requirement to version 6.0, released in 2005.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343109
-     2.4.x patch: trunk patch works
-     +1: jim, sf
-
    * util: make varbuf functions treat AP_VARBUF_UNKNOWN consistently
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1359884
      2.4.x patch: trunk patch works