From: Jeff Trawick <trawick@apache.org>
Date: Sun, 18 Aug 2013 00:42:49 +0000 (+0000)
Subject: promote previously-approved ab buffer overflow fix
X-Git-Tag: 2.4.7~296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86d2951dee3f5aae4055644ce07667c7bbb95eb5;p=apache

promote previously-approved ab buffer overflow fix


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

diff --git a/STATUS b/STATUS
index 8134aedbc9..466f8bd8ac 100644
--- a/STATUS
+++ b/STATUS
@@ -104,6 +104,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/r1514214
         http://svn.apache.org/r1514617
 
+  * ab: Fix potential buffer overflows when processing the T and X
+    command-line options.  PR 55360.
+    trunk: http://svn.apache.org/r1510707
+    2.4.x patch: trunk patch works (with offset)
+    +1: trawick, jim, druggeri
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -203,12 +208,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works
     +1: jim, druggeri
 
-  * ab: Fix potential buffer overflows when processing the T and X
-    command-line options.  PR 55360.
-    trunk: http://svn.apache.org/r1510707
-    2.4.x patch: trunk patch works (with offset)
-    +1: trawick, jim, druggeri
-
   * configure: '--enable-maintainer-mode' should also auto-enable mod_bucketeer
     trunk: http://svn.apache.org/viewvc?view=revision&revision=1503680
     2.4.x patch: trunk patch works