From: Joe Orton <jorton@apache.org>
Date: Tue, 2 Dec 2003 14:23:25 +0000 (+0000)
Subject: Backport from HEAD:
X-Git-Tag: 2.0.49~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2c0ccf1f3b685b8b342c2522ae1cf37e39ce9e;p=thirdparty%2Fapache%2Fhttpd.git

Backport from HEAD:

* ssl_util.c (ssl_util_thread_cleanup): Clear the id_callback.


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

diff --git a/CHANGES b/CHANGES
index f54fd82e4bf..8dc63159c6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) mod_ssl: Fix segfaults at startup if other modules which use OpenSSL
+     are also loaded.  [Joe Orton]
+
   *) mod_ssl: Use human-readable OpenSSL error strings in logs; use
      thread-safe interface for retrieving error strings.  [Joe Orton]
 
diff --git a/STATUS b/STATUS
index 09b504356b8..18d6c8c9409 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/02 14:21:26 $]
+Last modified at [$Date: 2003/12/02 14:23:23 $]
 
 Release:
 
@@ -80,13 +80,6 @@ PATCHES TO BACKPORT FROM 2.1
       +1: stoddard
       +1 (concept): trawick (looks reasonable when compared with worker)
 
-    * Don't leave the OpenSSL "id_callback" pointer dangling after
-      unloading mod_ssl; this fixes segfaults during startup if
-      other modules (or libraries used by other modules, e.g. PHP
-      stuff) use OpenSSL.
-      modules/ssl/ssl_util.c: r1.40
-      +1: jorton, trawick, stoddard
-
     * Prevent mod_proxy from sending an invalid status-line to clients
       in some cases.
       modules/proxy/proxy_http.c: r1.172
diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index e4ec2fa3061..3f8c74d86e5 100644
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -454,6 +454,7 @@ static unsigned long ssl_util_thr_id(void)
 static apr_status_t ssl_util_thread_cleanup(void *data)
 {
     CRYPTO_set_locking_callback(NULL);
+    CRYPTO_set_id_callback(NULL);
 
     /* Let the registered mutex cleanups do their own thing 
      */