Skip to content

Commit a364b76

Browse files
committed
* 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
1 parent 7f6709a commit a364b76

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

modules/ssl/ssl_engine_mutex.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ int ssl_mutex_reinit(server_rec *s, apr_pool_t *p)
8787
SSLModConfigRec *mc = myModConfig(s);
8888
apr_status_t rv;
8989

90-
if (mc->nMutexMode == SSL_MUTEXMODE_NONE)
90+
if (mc->nMutexMode == SSL_MUTEXMODE_NONE || !mc->sesscache
91+
|| (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) == 0) {
9192
return TRUE;
93+
}
9294

9395
if ((rv = apr_global_mutex_child_init(&mc->pMutex,
9496
mc->szMutexFile, p)) != APR_SUCCESS) {

0 commit comments

Comments
 (0)