Changeset 6945efb in mod_gnutls

Timestamp:

Apr 19, 2018, 2:47:40 PM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, main, master, proxy-ticket

Children:

3656df0

Parents:

3381559

Message:

mc_cache_fetch: Don't require a connection context

File:

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

src/gnutls_cache.c

@@ -292 +292 @@
 }
 
-static gnutls_datum_t mc_cache_fetch(conn_rec *c, const char *key)
+/**
+ * @param s server reference for logging
+ * @param key the key to fetch
+ * @param pool pool from which to allocate memory for the result
+ */
+static gnutls_datum_t mc_cache_fetch(server_rec *s, const char *key,
+                                     apr_pool_t *pool)
 {
     apr_status_t rv = APR_SUCCESS;
@@ -299 +305 @@
     gnutls_datum_t data = {NULL, 0};
 
-    rv = apr_memcache_getp(mc, c->pool, key, &value, &value_len, NULL);
+    rv = apr_memcache_getp(mc, pool, key, &value, &value_len, NULL);
 
     if (rv != APR_SUCCESS)
     {
-#if MOD_GNUTLS_DEBUG
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, c,
-                      "error fetching key '%s'",
-                      key);
-#endif
+        ap_log_error(APLOG_MARK, APLOG_TRACE2, rv, s,
+                     "error fetching key '%s'",
+                     key);
         return data;
     }
@@ -331 +335 @@
 
     const char *strkey = apr_psprintf(ctxt->c->pool, MC_TAG "%s", hex);
-    return mc_cache_fetch(ctxt->c, strkey);
+    return mc_cache_fetch(ctxt->c->base_server, strkey, ctxt->c->pool);
 }
 
@@ -343 +347 @@
         return data;
 
-    return mc_cache_fetch(ctxt->c, strkey);
+    return mc_cache_fetch(ctxt->c->base_server, strkey, ctxt->c->pool);
 }