]> granicus.if.org Git - apache/commitdiff
* Do not segfault when either no mutex is needed either because no session
authorRuediger Pluem <rpluem@apache.org>
Wed, 27 Feb 2008 19:55:25 +0000 (19:55 +0000)
committerRuediger Pluem <rpluem@apache.org>
Wed, 27 Feb 2008 19:55:25 +0000 (19:55 +0000)
  cache is configured or the session is thread safe.

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

modules/ssl/ssl_engine_mutex.c

index 7c6145cbcdc1e8b2ab2eeac37431304a1e23cf99..649c324311fefe561d941e74ee505574bd0a2b9a 100644 (file)
@@ -87,8 +87,10 @@ int ssl_mutex_reinit(server_rec *s, apr_pool_t *p)
     SSLModConfigRec *mc = myModConfig(s);
     apr_status_t rv;
 
-    if (mc->nMutexMode == SSL_MUTEXMODE_NONE)
+    if (mc->nMutexMode == SSL_MUTEXMODE_NONE || !mc->sesscache
+        || (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) == 0) {
         return TRUE;
+    }
 
     if ((rv = apr_global_mutex_child_init(&mc->pMutex,
                                     mc->szMutexFile, p)) != APR_SUCCESS) {