promote

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

diff --git a/STATUS b/STATUS
index 177dc794fd38c633c4a66d985d522190f1259d08..f6036298b70c16b236ba8f1485e7fd252a5dfcad 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -96,22 +96,16 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-   * mod_proxy Connection handling crasher, CVE-2014-0117
-   trunk patch: http://svn.apache.org/r1610674
-   ALTERNATIVE #1
-   2.4.x patch: http://people.apache.org/~jorton/CVE-2014-0117-simple.patch
-   +1: jorton, jim, trawick
 
-   ALTERNATIVE #2
-   2.4.x patch: http://people.apache.org/~jorton/2.4.x-CVE-2014-0117_v2.patch (ylavic)
-   +1: jorton, ylavic
-   -0.99: jim (not enough time for a serious review for inclusion in 2.4.10)
-   ylavic: works here, and checking RFC compliance if the Connection header
-           looks quite important to me.
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_proxy Connection handling crasher, CVE-2014-0117
+   trunk patch: http://svn.apache.org/r1610674
+   ALTERNATIVE #1
+   2.4.x patch: http://people.apache.org/~jorton/CVE-2014-0117-simple.patch
+   +1: jorton, jim, trawick
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK: