Changeset 6bbd378 in mod_gnutls
- Timestamp:
- Apr 24, 2018, 12:30:33 PM (5 years ago)
- Branches:
- asyncio, debian/master, master, proxy-ticket
- Children:
- ded2291
- Parents:
- 0363315
- Files:
-
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r0363315 r6bbd378 177 177 AC_MSG_RESULT($use_msva) 178 178 179 have_apr_memcache=0180 CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])181 AC_SUBST(have_apr_memcache)182 183 179 # Building documentation requires pandoc, which in turn needs pdflatex 184 180 # to build PDF output. … … 213 209 AC_PATH_PROGS([HTTP_CLI], [curl wget], [no]) 214 210 215 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${AP R_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"216 MODULE_LIBS="${ APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"211 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}" 212 MODULE_LIBS="${LIBGNUTLS_LIBS}" 217 213 218 214 AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no]) -
include/mod_gnutls.h.in
r0363315 r6bbd378 38 38 #define __mod_gnutls_h_inc 39 39 40 #define HAVE_APR_MEMCACHE @have_apr_memcache@41 42 40 extern module AP_MODULE_DECLARE_DATA gnutls_module; 43 41 … … 67 65 /* Use Gnu's version of Berkley DB */ 68 66 mgs_cache_gdbm, 69 #if HAVE_APR_MEMCACHE70 67 /* Use Memcache */ 71 68 mgs_cache_memcache, 72 #endif73 69 mgs_cache_shmcb, 74 70 mgs_cache_unset -
src/gnutls_cache.c
r0363315 r6bbd378 49 49 50 50 #include <ap_socache.h> 51 52 #if HAVE_APR_MEMCACHE53 #include "apr_memcache.h"54 #endif55 56 #include "apr_dbm.h"57 51 #include <apr_escape.h> 58 59 #include "ap_mpm.h"60 52 #include <util_mutex.h> 61 62 #include <unistd.h>63 #include <sys/types.h>64 65 #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)66 #include "unixd.h"67 #endif68 53 69 54 /** Default session cache timeout */ 70 55 #define MGS_DEFAULT_CACHE_TIMEOUT 300 71 56 72 /** Prefix for keys used with a memcached cache */73 #define MC_TAG "mod_gnutls:"74 57 /** Maximum length of the hex string representation of a GnuTLS 75 58 * session ID: two characters per byte, plus one more for `\0` */ … … 78 61 #else 79 62 #define GNUTLS_SESSION_ID_STRING_LEN ((GNUTLS_MAX_SESSION_ID * 2) + 1) 80 #endif81 82 #if MODULE_MAGIC_NUMBER_MAJOR < 2008120183 #define ap_unixd_config unixd_config84 63 #endif 85 64 … … 326 305 327 306 if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) 328 {329 307 pname = "dbm"; 330 sc->cache->store = socache_store;331 sc->cache->fetch = socache_fetch;332 //return dbm_cache_post_config(pconf, s, sc);333 }334 #if HAVE_APR_MEMCACHE335 308 else if (sc->cache_type == mgs_cache_memcache) 336 {337 309 pname = "memcache"; 338 sc->cache->store = socache_store;339 sc->cache->fetch = socache_fetch;340 }341 #endif342 310 else if (sc->cache_type == mgs_cache_shmcb) 343 {344 311 pname = "shmcb"; 345 sc->cache->store = socache_store; 346 sc->cache->fetch = socache_fetch;347 }312 313 sc->cache->store = socache_store; 314 sc->cache->fetch = socache_fetch; 348 315 349 316 /* Find the right socache provider */ -
src/gnutls_config.c
r0363315 r6bbd378 618 618 sc->cache_type = mgs_cache_gdbm; 619 619 } 620 #if HAVE_APR_MEMCACHE621 620 else if (strcasecmp("memcache", type) == 0) { 622 621 sc->cache_type = mgs_cache_memcache; 623 622 } 624 #endif625 623 else if (strcasecmp("shmcb", type) == 0) { 626 624 sc->cache_type = mgs_cache_shmcb;
Note: See TracChangeset
for help on using the changeset viewer.