From: Joe Orton <jorton@apache.org>
Date: Fri, 13 Jan 2006 14:23:33 +0000 (+0000)
Subject: 2*backports backported, 1*review.
X-Git-Tag: 2.2.1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=921776768cf18eb082652ca93f1ad7f6b14d0eac;p=thirdparty%2Fapache%2Fhttpd.git

2*backports backported, 1*review.


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

diff --git a/STATUS b/STATUS
index c0f69bcbd26..0579c74dfb5 100644
--- a/STATUS
+++ b/STATUS
@@ -89,24 +89,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_ssl/ab: Fix compiler warnings with OpenSSL 0.9.8a.
-        http://svn.apache.org/viewcvs.cgi?rev=349415&view=rev
-      +1: jorton, jerenkrantz, wrowe
-
     * HTTP: If a connection aborts while waiting for a chunked line,
       flag the connection as errored out.
       http://svn.apache.org/viewcvs.cgi?rev=354630&view=rev
       Message-ID: <4395A056.2070000@web.turner.com>
       +1: jerenkrantz, jim, wrowe
 
-    * mod_ssl: Fix PR37791 (CVEID: CAN-2005-3357) (SEGV if the client is
-      connection plain to a SSL enabled port)
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=354394&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jorton, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init
@@ -164,6 +152,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     * Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
         URL: http://svn.apache.org/viewcvs?rev=358040&view=rev
       +1: wrowe, mturk
+      -0: jorton: should use AP_METHOD_BIT
 
     * mod_cache: Fix PR38017 (mod_cache not working in reverse proxy setup?)
       Trunk version of patch: