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 69b2eb998846ba30f5ffb315ae470f45a8fa0f7d..26fb44db57782f2b15247e81799dd337216459a1 100644 (file)
--- 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 adb54a4c7785de4958743c76c43730b5fb56f021..9a58dd4b14cf4b98cddc693e0baaf9d74b6eff3e 100644 (file)
--- 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;
 }