From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 28 Jun 2012 06:14:16 +0000 (+0000)
Subject: From under-consideration up into accepted
X-Git-Tag: 2.2.23~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7be59530b1f13237780e0cab8484d460c73599e1;p=thirdparty%2Fapache%2Fhttpd.git

From under-consideration up into accepted

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

diff --git a/STATUS b/STATUS
index 035e94624a2..a85cda4cb8c 100644
--- a/STATUS
+++ b/STATUS
@@ -93,6 +93,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core: NUL-terminate string returned by ap_scan_script_header_err*()
+    in error case.
+    Trunk patch:
+      http://svn.apache.org/viewvc?rev=1244211&view=rev
+    2.4.x patch:
+      http://svn.apache.org/viewvc?rev=1244213&view=rev
+    2.2.x patch:
+      Trunk version works
+    +1: sf, covener, wrowe
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -128,16 +137,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     rpluem says: The proposed patch contains tabs and indenting is not correct.
                  This should be fixed first.
 
-  * core: NUL-terminate string returned by ap_scan_script_header_err*()
-    in error case.
-    Trunk patch:
-      http://svn.apache.org/viewvc?rev=1244211&view=rev
-    2.4.x patch:
-      http://svn.apache.org/viewvc?rev=1244213&view=rev
-    2.2.x patch:
-      Trunk version works
-    +1: sf, covener, wrowe
-
   * mod_dumpio: Return an error code from a previous input filter
     PR 52914
     Trunk patch: http://svn.apache.org/viewvc?rev=1301111&view=rev