From: Joe Orton <jorton@apache.org>
Date: Mon, 16 Jul 2007 13:25:23 +0000 (+0000)
Subject: Merged one.
X-Git-Tag: 2.0.60~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30118924b43d230adcfb4f595d2896b479371f08;p=thirdparty%2Fapache%2Fhttpd.git

Merged one.


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

diff --git a/STATUS b/STATUS
index cb2bc8e1378..0b87aec42a7 100644
--- a/STATUS
+++ b/STATUS
@@ -114,14 +114,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * SECURITY: CVE-2007-1863 (cve.mitre.org)
-      mod_cache: Prevent segfault from Cache-Control headers with no
-      values
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&rev=535617
-      2.0.x version of patch:
-        http://people.apache.org/~mjc/cve-2007-1863-2.0.patch
-      +1: mjc, rpluem, jorton
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to