Changeset 040387c in mod_gnutls for include

Timestamp:

Jan 29, 2013, 8:05:42 PM (9 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

0367e02

Parents:

32538ff

git-author:

Daniel Kahn Gillmor <dkg@…> (01/27/13 03:53:01)

git-committer:

Daniel Kahn Gillmor <dkg@…> (01/29/13 20:05:42)

Message:

server-wide settings should be defaults unless overridden in a vhost

Previously, there was no merging possible; so if any directives were
set in a vhost, all other directives set from the server config would
be thrown away.

File:

• include/mod_gnutls.h.in (modified) (3 diffs)

include/mod_gnutls.h.in

@@ -50 +50 @@
 #define GNUTLS_ENABLED_FALSE 0
 #define GNUTLS_ENABLED_TRUE  1
+#define GNUTLS_ENABLED_UNSET  2
 /* Current module version */
 #define MOD_GNUTLS_VERSION "0.5.10"
@@ -75 +76 @@
 #if HAVE_APR_MEMCACHE
         /* Use Memcache */
-    mgs_cache_memcache
+    mgs_cache_memcache,
 #endif
+    mgs_cache_unset
 } mgs_cache_e;
 
@@ -355 +357 @@
                                     void *mconfig, const char *arg);
 void *mgs_config_server_create(apr_pool_t * p, server_rec * s);
+void *mgs_config_server_merge(apr_pool_t *p, void *BASE, void *ADD);
 
 void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv);