svn commit: r1354824 - /httpd/httpd/branches/2.2.x/STATUS

[wr...@apache.org]

Author: wrowe
Date: Thu Jun 28 06:14:16 2012
New Revision: 1354824

URL: http://svn.apache.org/viewvc?rev=1354824&view=rev
Log:
>From under-consideration up into accepted

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1354824&r1=1354823&r2=1354824&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Jun 28 06:14:16 2012
@@ -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