From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 27 Feb 2008 19:55:25 +0000 (+0000)
Subject: * Do not segfault when either no mutex is needed either because no session
X-Git-Tag: 2.3.0~923
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=216dedd28441709208989ed72a071704b8a3c15c;p=apache

* Do not segfault when either no mutex is needed either because no session
  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
---

diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c
index 7c6145cbcd..649c324311 100644
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -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) {