From: Philip M. Gollucci <pgollucci@apache.org>
Date: Wed, 12 May 2010 23:31:04 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.0.64~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5d1ba76ee3a7c932f9922fbf806d1a0fd8d90c6;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index a4bf47874d6..157e43ff187 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     Backport version for 2.0.x of patch:
        http://people.apache.org/~fuankg/diffs/httpd-2.0.x-ap_vhost_iterate_given_conn.diff
     +1: fuankg, wrowe, pgollucci
+  * mod_ssl: Partial fix for CVE-2009-3555
+    Trunk version of patch:
+      http://svn.apache.org/viewvc?rev=833582&view=rev
+      http://svn.apache.org/viewvc?rev=833593&view=rev
+      http://svn.apache.org/viewvc?rev=881222&view=rev
+    Patch in 2.2.x branch:
+      http://svn.apache.org/viewvc?rev=833622&view=rev
+    Backport version for 2.0.x of patch (Updated with backport of r881222):
+      http://people.apache.org/~rjung/patches/cve-2009-3555_httpd_2_0_x-v2.patch
+    +1: rjung, rpluem, pgollucci (+1 2.0.64 w/ this)
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
@@ -163,17 +173,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              if (nLogFD == NULL) {
                  /* Uh-oh. Failed to open the new log file. Try to clear
 
-  * mod_ssl: Partial fix for CVE-2009-3555
-    Trunk version of patch:
-      http://svn.apache.org/viewvc?rev=833582&view=rev
-      http://svn.apache.org/viewvc?rev=833593&view=rev
-      http://svn.apache.org/viewvc?rev=881222&view=rev
-    Patch in 2.2.x branch:
-      http://svn.apache.org/viewvc?rev=833622&view=rev
-    Backport version for 2.0.x of patch (Updated with backport of r881222):
-      http://people.apache.org/~rjung/patches/cve-2009-3555_httpd_2_0_x-v2.patch
-    +1: rjung, rpluem, pgollucci (+1 2.0.64 w/ this)
-
   * mod_ssl: Further mitigation for the TLS renegotation attack, CVE-2009-3555
     Trunk version of patch:
       http://svn.apache.org/viewvc?rev=891282&view=rev