Changeset f52f1b4 in mod_gnutls

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.

Files:

• doc/mod_gnutls_manual.mdwn (modified) (1 diff)
• src/gnutls_config.c (modified) (2 diffs)
• src/gnutls_hooks.c (modified) (2 diffs)
• test/tests/03_cachetimeout_in_vhost/apache.conf (modified) (1 diff)
• test/tests/03_cachetimeout_in_vhost/fail.server (deleted)
• test/tests/03_cachetimeout_in_vhost/output (added)

doc/mod_gnutls_manual.mdwn

@@ -118 +118 @@
 
 Default: `GnuTLSCacheTimeout 300`\
-Context: server config
+Context: server config, virtual host
 
 Sets the timeout for TLS Session Cache entries expiration. This value

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);

src/gnutls_hooks.c

@@ -21 +21 @@
 #include "mod_gnutls.h"
 #include "gnutls_cache.h"
+#include "gnutls_config.h"
 #include "gnutls_ocsp.h"
 #include "gnutls_util.h"
@@ -631 +632 @@
         sc->cache_enable = sc_base->cache_enable;
         sc->cache_config = sc_base->cache_config;
-        sc->cache_timeout = sc_base->cache_timeout;
         sc->cache = sc_base->cache;
+        if (sc->cache_timeout == MGS_TIMEOUT_UNSET)
+            sc->cache_timeout = sc_base->cache_timeout;
 
         sc->singleton_wd = sc_base->singleton_wd;

test/tests/03_cachetimeout_in_vhost/apache.conf

@@ -1 +1 @@
 Include ${srcdir}/base_apache.conf
+GnuTLSCache shmcb:cache/gnutls_cache_${TEST_NAME}
 
 <VirtualHost _default_:${TEST_PORT}>
- # Cache configuration not allowed in here:
  GnuTLSCacheTimeout 200
  ServerName ${TEST_HOST}