From: Jeff Trawick <trawick@apache.org>
Date: Thu, 13 May 2010 16:00:37 +0000 (+0000)
Subject: CVE-2009-3094 patch fixes crash for me
X-Git-Tag: 2.0.64~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06e85ad8165553b5b58fcdd078b93bc13347975d;p=thirdparty%2Fapache%2Fhttpd.git

CVE-2009-3094 patch fixes crash for me


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

diff --git a/STATUS b/STATUS
index ccc3286b7ad..93c0b65f70a 100644
--- a/STATUS
+++ b/STATUS
@@ -141,6 +141,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     +1: pgollucci, poirier, rjung
       PG: whomever proposed this should vote for it
 
+  * mod_proxy_ftp, CVE-2009-3094, NULL pointer dereference on error paths
+    Patch in 2.2.x branch:
+      http://svn.apache.org/viewvc?view=revision&revision=814844
+    Backport:
+      http://people.apache.org/~trawick/CVE-2009-3094-2.0.txt
+    +1: pgollucci, poirier, trawick
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
@@ -208,14 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     with some offset and fuzz.
     +1: rjung, pgollucci (+1 2.0.64 w/ this)
 
-  * mod_proxy_ftp, CVE-2009-3094, NULL pointer dereference on error paths
-    Patch in 2.2.x branch:
-      http://svn.apache.org/viewvc?view=revision&revision=814844
-    Backport:
-      http://people.apache.org/~trawick/CVE-2009-3094-2.0.txt
-    +1: pgollucci, poirier
-      PG: whomever proposed this should vote for it
-
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.