Changeset f52f1b4 in mod_gnutls for src/gnutls_config.c

Timestamp:

Apr 29, 2018, 3:19:05 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

56c722f

Parents:

d8d6b1e

git-author:

Fiona Klute <fiona.klute@…> (04/29/18 14:56:51)

git-committer:

Fiona Klute <fiona.klute@…> (04/29/18 15:19:05)

Message:

Allow GnuTLSCacheTimeout in virtual host config

I'm not sure if anyone needs this, but it simplifies timeout
configuration handling and is certainly not a bad thing.

File:

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

src/gnutls_config.c

@@ -640 +640 @@
 
     if (!apr_strnatcasecmp(parms->directive->directive, "GnuTLSCacheTimeout"))
-    {
-        const char *err;
-        if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY)))
-            return err;
         sc->cache_timeout = apr_time_from_sec(argint);
-    }
     else if (!apr_strnatcasecmp(parms->directive->directive,
                                 "GnuTLSOCSPCacheTimeout"))
@@ -946 +941 @@
     gnutls_srvconf_merge(dh_file, NULL);
     gnutls_srvconf_merge(priorities_str, NULL);
+    gnutls_srvconf_merge(cache_timeout, MGS_TIMEOUT_UNSET);
 
     gnutls_srvconf_merge(proxy_x509_key_file, NULL);