]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
From under-consideration up into accepted
authorWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 28 Jun 2012 06:14:16 +0000 (06:14 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 28 Jun 2012 06:14:16 +0000 (06:14 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1354824 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 035e94624a24e19434dfda103a920fe462746ba5..a85cda4cb8c695ccd4c1b98aa6100d5767e575b8 100644 (file)
--- 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