Changeset 6bbd378 in mod_gnutls for src/gnutls_cache.c


Ignore:
Timestamp:
Apr 24, 2018, 12:30:33 PM (3 years ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
asyncio, debian/master, master, proxy-ticket
Children:
ded2291
Parents:
0363315
Message:

Remove special handling for APR memcache and leftover includes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_cache.c

    r0363315 r6bbd378  
    4949
    5050#include <ap_socache.h>
    51 
    52 #if HAVE_APR_MEMCACHE
    53 #include "apr_memcache.h"
    54 #endif
    55 
    56 #include "apr_dbm.h"
    5751#include <apr_escape.h>
    58 
    59 #include "ap_mpm.h"
    6052#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 #endif
    6853
    6954/** Default session cache timeout */
    7055#define MGS_DEFAULT_CACHE_TIMEOUT 300
    7156
    72 /** Prefix for keys used with a memcached cache */
    73 #define MC_TAG "mod_gnutls:"
    7457/** Maximum length of the hex string representation of a GnuTLS
    7558 * session ID: two characters per byte, plus one more for `\0` */
     
    7861#else
    7962#define GNUTLS_SESSION_ID_STRING_LEN ((GNUTLS_MAX_SESSION_ID * 2) + 1)
    80 #endif
    81 
    82 #if MODULE_MAGIC_NUMBER_MAJOR < 20081201
    83 #define ap_unixd_config unixd_config
    8463#endif
    8564
     
    326305
    327306    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm)
    328     {
    329307        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_MEMCACHE
    335308    else if (sc->cache_type == mgs_cache_memcache)
    336     {
    337309        pname = "memcache";
    338         sc->cache->store = socache_store;
    339         sc->cache->fetch = socache_fetch;
    340     }
    341 #endif
    342310    else if (sc->cache_type == mgs_cache_shmcb)
    343     {
    344311        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;
    348315
    349316    /* Find the right socache provider */
Note: See TracChangeset for help on using the changeset viewer.