Changeset 0363315 in mod_gnutls

Timestamp:

Apr 24, 2018, 2:21:35 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

6bbd378

Parents:

6c5c2ec

Message:

Use cache mutex only if socache provider is not multiprocess/thread safe

File:

• src/gnutls_cache.c (modified) (4 diffs)

src/gnutls_cache.c

@@ -142 +142 @@
     apr_pool_create(&spool, NULL);
 
-    apr_global_mutex_lock(sc->cache->mutex);
+    if (sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_lock(sc->cache->mutex);
     apr_status_t rv = sc->cache->prov->store(sc->cache->socache, server,
                                              key.data, key.size,
@@ -148 +149 @@
                                              data.data, data.size,
                                              spool);
-    apr_global_mutex_unlock(sc->cache->mutex);
+    if (sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_unlock(sc->cache->mutex);
 
     if (rv != APR_SUCCESS)
@@ -202 +204 @@
     apr_pool_create(&spool, pool);
 
-    apr_global_mutex_lock(sc->cache->mutex);
+    if (sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_lock(sc->cache->mutex);
     apr_status_t rv = sc->cache->prov->retrieve(sc->cache->socache, server,
                                                 key.data, key.size,
                                                 data.data, &data.size,
                                                 spool);
-    apr_global_mutex_unlock(sc->cache->mutex);
+    if (sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_unlock(sc->cache->mutex);
 
     if (rv != APR_SUCCESS)
@@ -258 +262 @@
         return -1;
 
-    apr_global_mutex_lock(ctxt->sc->cache->mutex);
+    if (ctxt->sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_lock(ctxt->sc->cache->mutex);
     apr_status_t rv = ctxt->sc->cache->prov->remove(ctxt->sc->cache->socache,
                                                     ctxt->c->base_server,
                                                     key.data, key.size,
                                                     ctxt->c->pool);
-    apr_global_mutex_unlock(ctxt->sc->cache->mutex);
+    if (ctxt->sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_unlock(ctxt->sc->cache->mutex);
 
     if (rv != APR_SUCCESS) {