Changeset 78d75ac in mod_gnutls

Timestamp:

Sep 30, 2018, 12:55:08 PM (17 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

bd2b48b

Parents:

0d7660d

Message:

Use the right cache config string in cache trace logs

File:

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

src/gnutls_cache.c

@@ -109 +109 @@
                     apr_time_t expiry)
 {
-    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
-        ap_get_module_config(server->module_config, &gnutls_module);
-
     apr_pool_t *spool;
     apr_pool_create(&spool, NULL);
@@ -129 +126 @@
         ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, server,
                      "error storing in cache '%s:%s'",
-                     cache->prov->name, sc->cache->config);
+                     cache->prov->name, cache->config);
         apr_pool_destroy(spool);
         return -1;
@@ -137 +134 @@
                  "stored %u bytes of data (%u byte key) in cache '%s:%s'",
                  data.size, key.size,
-                 cache->prov->name, sc->cache->config);
+                 cache->prov->name, cache->config);
     apr_pool_destroy(spool);
     return 0;
@@ -183 +180 @@
                                gnutls_datum_t key, apr_pool_t *pool)
 {
-    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
-        ap_get_module_config(server->module_config, &gnutls_module);
-
     gnutls_datum_t data = {NULL, 0};
     data.data = gnutls_malloc(SOCACHE_FETCH_BUF_SIZE);
@@ -210 +204 @@
             ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
                          "requested entry not found in cache '%s:%s'.",
-                         cache->prov->name, sc->cache->config);
+                         cache->prov->name, cache->config);
         else
             ap_log_error(APLOG_MARK, APLOG_WARNING, rv, server,
                          "error fetching from cache '%s:%s'",
-                         cache->prov->name, sc->cache->config);
+                         cache->prov->name, cache->config);
         /* free unused buffer */
         gnutls_free(data.data);
@@ -224 +218 @@
         ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
                      "fetched %u bytes from cache '%s:%s'",
-                     data.size, cache->prov->name, sc->cache->config);
+                     data.size, cache->prov->name, cache->config);
 
         /* Realloc buffer to data.size. Data size must be less than or