From: Joe Orton <jorton@apache.org>
Date: Tue, 15 Jul 2014 16:20:10 +0000 (+0000)
Subject: CVE-2014-0117 done, the simple/dumb way.
X-Git-Tag: 2.4.10~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f35bd187d0d8bdc6cec847e721ddb1e30e99bd45;p=apache

CVE-2014-0117 done, the simple/dumb way.

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

diff --git a/STATUS b/STATUS
index f6036298b7..4498cbd3b2 100644
--- a/STATUS
+++ b/STATUS
@@ -101,12 +101,6 @@ RELEASE SHOWSTOPPERS:
 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:
   [ New proposals should be added at the end of the list ]