From: Doug MacEachern <dougm@apache.org>
Date: Wed, 9 Jan 2002 22:21:34 +0000 (+0000)
Subject: call ssl_mutex_kill() during module cleanup
X-Git-Tag: 2.0.31~246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9236e4bfa20d063a39c89b3fb5b779d493401acd;p=apache

call ssl_mutex_kill() during module cleanup


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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 69b2eb9988..26fb44db57 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -991,9 +991,8 @@ apr_status_t ssl_init_ModuleKill(void *data)
      * Drop the session cache and mutex
      */
     ssl_scache_kill(s);
-#if 0 /* XXX */
+
     ssl_mutex_kill(s);
-#endif
 
     /* 
      * Destroy the temporary keys and params
diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c
index adb54a4c77..9a58dd4b14 100644
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -117,8 +117,12 @@ int ssl_mutex_kill(server_rec *s)
 
     if (mc->nMutexMode == SSL_MUTEXMODE_NONE)
         return TRUE;
+    /* XXX: currently mutex is not created until 2nd pass at startup */
+    if (!mc->pMutex)
+        return TRUE;
     if (apr_lock_destroy(mc->pMutex) != APR_SUCCESS)
         return FALSE;
+    mc->pMutex = NULL;
     return TRUE;
 }