Changeset ce5f776 in mod_gnutls for src/gnutls_config.c

Timestamp:

May 2, 2018, 2:30:26 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

eaa8a9d

Parents:

5ab2868

Message:

Move config and post_config of a cache instance to separate functions

This prepares the infrastructure for multiple caches and simplifies
the server configuration structure.

File:

• src/gnutls_config.c (modified) (5 diffs)

src/gnutls_config.c

@@ -18 +18 @@
  */
 
+#include "gnutls_cache.h"
 #include "gnutls_config.h"
 #include "mod_gnutls.h"
@@ -595 +596 @@
     {
         sc->cache_enable = GNUTLS_ENABLED_FALSE;
-        sc->cache_type = NULL;
-        sc->cache_config = NULL;
         return NULL;
     }
@@ -606 +605 @@
     if (sep)
     {
-        sc->cache_type = apr_pstrmemdup(parms->pool, type, sep - type);
+        type = apr_pstrmemdup(parms->temp_pool, type, sep - type);
         if (arg != NULL)
         {
@@ -615 +614 @@
         arg = ++sep;
     }
-    else
-        sc->cache_type = apr_pstrdup(parms->pool, type);
-
-    if (arg == NULL)
-        sc->cache_config = "";
-    else
-        sc->cache_config = apr_pstrdup(parms->pool, arg);
-
-    return NULL;
+
+    return mgs_cache_inst_config(&sc->cache, parms->server,
+                                 type, arg,
+                                 parms->pool, parms->temp_pool);
 }
 
@@ -860 +854 @@
     sc->priorities_str = NULL;
     sc->cache_timeout = MGS_TIMEOUT_UNSET;
-    sc->cache_type = NULL;
     sc->cache_enable = GNUTLS_ENABLED_UNSET;
-    sc->cache_config = NULL;
     sc->cache = NULL;
     sc->tickets = GNUTLS_ENABLED_UNSET;