]> granicus.if.org Git - apache/commitdiff
Promote.
authorGraham Leggett <minfrin@apache.org>
Thu, 23 May 2013 14:26:22 +0000 (14:26 +0000)
committerGraham Leggett <minfrin@apache.org>
Thu, 23 May 2013 14:26:22 +0000 (14:26 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1485726 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 9446990d9004844d8e82ae43b58a8a6e38350ce6..f8963546ae1fb62d74f82a59a4f15f2db046ba74 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * core: Do not over allocate memory within 'ap_rgetline_core' for the common case.
+      trunk patch: http://svn.apache.org/r1483005
+      2.4.x patch: trunk works
+      +1: jailletc36, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -319,11 +324,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk works (with fuzz)
       +1: fuankg
 
-    * core: Do not over allocate memory within 'ap_rgetline_core' for the common case.
-      trunk patch: http://svn.apache.org/r1483005
-      2.4.x patch: trunk works
-      +1: jailletc36, jim, minfrin
-
     * mod_proxy_http: Make the proxy-interim-response environment variable
       effective by formally overriding origin server behaviour.
       trunk patch: http://svn.apache.org/r1483027