]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix a serious bug where the 'next' generation of the server would open
authorWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 27 Mar 2003 23:34:06 +0000 (23:34 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 27 Mar 2003 23:34:06 +0000 (23:34 +0000)
  a brand new mutex.  This patch creates a single mutex in the first config
  phase that survives for the life of the server (server->process->pool).

  Now one server generation to the next will respect the same mutex between
  one another, while the previous generation is still mopping up.

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

ssl_engine_mutex.c

index 9e27cc98a59fce9b76de43eadc0d29762c41b77f..4ff13e829f7b860b5ee2846ae5d5338f52e34aad 100644 (file)
@@ -73,8 +73,12 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p)
     if (mc->nMutexMode == SSL_MUTEXMODE_NONE) 
         return TRUE;
 
+    if (ssl_config_global_isfixed(mc)) {
+        return TRUE;
+    }
     if ((rv = apr_global_mutex_create(&mc->pMutex, mc->szMutexFile,
-                                mc->nMutexMech, p)) != APR_SUCCESS) {
+                                      mc->nMutexMech, s->process->pool))
+            != APR_SUCCESS) {
         if (mc->szMutexFile)
             ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
                          "Cannot create SSLMutex with file `%s'",