Changeset f785704 in mod_gnutls

Timestamp:

Jun 5, 2016, 3:42:31 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

ae08186

Parents:

04e6e65

git-author:

Thomas Klute <thomas2.klute@…> (06/04/16 19:57:24)

git-committer:

Thomas Klute <thomas2.klute@…> (06/05/16 15:42:31)

Message:

Make dbm_cache_expire() work outside connection context

DBM cache expiration is triggered from dbm_cache_store(), so this is
necessary to store data from outside a connection (e.g. regular OCSP
cache updates).

File:

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

src/gnutls_cache.c

@@ -309 +309 @@
 #define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
 
-static void dbm_cache_expire(mgs_handle_t * ctxt) {
+static void dbm_cache_expire(server_rec *s)
+{
+    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
+        ap_get_module_config(s->module_config, &gnutls_module);
+
     apr_status_t rv;
     apr_dbm_t *dbm;
     apr_datum_t dbmkey;
     apr_datum_t dbmval;
-    apr_time_t now;
     apr_time_t dtime;
     apr_pool_t *spool;
     int total, deleted;
 
-    now = apr_time_now();
-
-    if (now - ctxt->sc->last_cache_check <
-            (ctxt->sc->cache_timeout) / 2)
+    apr_time_t now = apr_time_now();
+
+    if (now - sc->last_cache_check < (sc->cache_timeout) / 2)
         return;
 
-    ctxt->sc->last_cache_check = now;
-
-    apr_pool_create(&spool, ctxt->c->pool);
+    sc->last_cache_check = now;
+
+    apr_pool_create(&spool, NULL);
 
     total = 0;
     deleted = 0;
 
-    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc),
-            ctxt->sc->cache_config, APR_DBM_RWCREATE,
+    rv = apr_dbm_open_ex(&dbm, db_type(sc),
+            sc->cache_config, APR_DBM_RWCREATE,
             SSL_DBM_FILE_MODE, spool);
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_NOTICE, rv,
-                ctxt->c->base_server,
+        ap_log_error(APLOG_MARK, APLOG_NOTICE, rv, s,
                 "[gnutls_cache] error opening cache searcher '%s'",
-                ctxt->sc->cache_config);
+                sc->cache_config);
         apr_pool_destroy(spool);
         return;
@@ -365 +366 @@
     apr_dbm_close(dbm);
 
-    ap_log_error(APLOG_MARK, APLOG_DEBUG, rv,
-            ctxt->c->base_server,
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s,
             "[gnutls_cache] Cleaned up cache '%s'. Deleted %d and left %d",
-            ctxt->sc->cache_config, deleted, total - deleted);
+            sc->cache_config, deleted, total - deleted);
 
     apr_pool_destroy(spool);
@@ -442 +442 @@
     /* we expire dbm only on every store
      */
-    dbm_cache_expire(ctxt);
+    dbm_cache_expire(ctxt->c->base_server);
 
     apr_pool_create(&spool, ctxt->c->pool);