Changeset 6bbd378 in mod_gnutls

Timestamp:

Apr 24, 2018, 12:30:33 PM (15 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

ded2291

Parents:

0363315

Message:

Remove special handling for APR memcache and leftover includes

Files:

• configure.ac (modified) (2 diffs)
• include/mod_gnutls.h.in (modified) (2 diffs)
• m4/apr_memcache.m4 (deleted)
• src/gnutls_cache.c (modified) (3 diffs)
• src/gnutls_config.c (modified) (1 diff)

configure.ac

@@ -177 +177 @@
 AC_MSG_RESULT($use_msva)
 
-have_apr_memcache=0
-CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
-AC_SUBST(have_apr_memcache)
-
 # Building documentation requires pandoc, which in turn needs pdflatex
 # to build PDF output.
@@ -213 +209 @@
 AC_PATH_PROGS([HTTP_CLI], [curl wget], [no])
 
-MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
-MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
+MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
+MODULE_LIBS="${LIBGNUTLS_LIBS}"
 
 AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no])

include/mod_gnutls.h.in

@@ -38 +38 @@
 #define __mod_gnutls_h_inc
 
-#define HAVE_APR_MEMCACHE    @have_apr_memcache@
-
 extern module AP_MODULE_DECLARE_DATA gnutls_module;
 
@@ -67 +65 @@
         /* Use Gnu's version of Berkley DB */
     mgs_cache_gdbm,
-#if HAVE_APR_MEMCACHE
         /* Use Memcache */
     mgs_cache_memcache,
-#endif
     mgs_cache_shmcb,
     mgs_cache_unset

src/gnutls_cache.c

@@ -49 +49 @@
 
 #include <ap_socache.h>
-
-#if HAVE_APR_MEMCACHE
-#include "apr_memcache.h"
-#endif
-
-#include "apr_dbm.h"
 #include <apr_escape.h>
-
-#include "ap_mpm.h"
 #include <util_mutex.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
-#include "unixd.h"
-#endif
 
 /** Default session cache timeout */
 #define MGS_DEFAULT_CACHE_TIMEOUT 300
 
-/** Prefix for keys used with a memcached cache */
-#define MC_TAG "mod_gnutls:"
 /** Maximum length of the hex string representation of a GnuTLS
  * session ID: two characters per byte, plus one more for `\0` */
@@ -78 +61 @@
 #else
 #define GNUTLS_SESSION_ID_STRING_LEN ((GNUTLS_MAX_SESSION_ID * 2) + 1)
-#endif
-
-#if MODULE_MAGIC_NUMBER_MAJOR < 20081201
-#define ap_unixd_config unixd_config
 #endif
 
@@ -326 +305 @@
 
     if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm)
-    {
         pname = "dbm";
-        sc->cache->store = socache_store;
-        sc->cache->fetch = socache_fetch;
-        //return dbm_cache_post_config(pconf, s, sc);
-    }
-#if HAVE_APR_MEMCACHE
     else if (sc->cache_type == mgs_cache_memcache)
-    {
         pname = "memcache";
-        sc->cache->store = socache_store;
-        sc->cache->fetch = socache_fetch;
-    }
-#endif
     else if (sc->cache_type == mgs_cache_shmcb)
-    {
         pname = "shmcb";
-        sc->cache->store = socache_store;
-        sc->cache->fetch = socache_fetch;
-    }
+
+    sc->cache->store = socache_store;
+    sc->cache->fetch = socache_fetch;
 
     /* Find the right socache provider */

src/gnutls_config.c

@@ -618 +618 @@
         sc->cache_type = mgs_cache_gdbm;
     }
-#if HAVE_APR_MEMCACHE
     else if (strcasecmp("memcache", type) == 0) {
         sc->cache_type = mgs_cache_memcache;
     }
-#endif
     else if (strcasecmp("shmcb", type) == 0) {
         sc->cache_type = mgs_cache_shmcb;