From: Jim Jagielski <jim@apache.org>
Date: Tue, 1 May 2007 13:17:30 +0000 (+0000)
Subject: Applied backport
X-Git-Tag: 2.2.5~272
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=679f5ee61aaba31fa2695317b3cdfeec7e0de97b;p=thirdparty%2Fapache%2Fhttpd.git

Applied backport


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

diff --git a/STATUS b/STATUS
index 276d5fe9fef..e5fec5dea3f 100644
--- a/STATUS
+++ b/STATUS
@@ -77,15 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_ssl: Move thread locking upcall initialization before
-      hardware library initialization, so hardware library can use
-      these upcalls when run in a threaded MPM. Fixes PR 20951. 
-      Trunk version of patch applies: 
-
-      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?r1=520701&r2=525709&view=patch
-      
-      +1: sctemme, rpluem, jim
-
    * support/htdbm.c: Enable crypt() support on platforms with crypt() but not
      <crypt.h>, such as z/OS.
      Trunk version of patch: