Merged.

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

diff --git a/STATUS b/STATUS
index 87480590b73204c36e6dde9d34a52877cf754a00..4af5a0ec7a940924e30afa7c140378583241beed 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -104,13 +104,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * SECURITY: CVE-2014-3583 (cve.mitre.org)
-     mod_proxy_fcgi: Fix a potential crash with response headers' size above 8K.
-     trunk patch: http://svn.apache.org/r1640036
-                  http://svn.apache.org/r1640331 (tweak to CHANGES)
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, trawick, mrumph
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]