Changeset 4addf74 in mod_gnutls for src/gnutls_cache.c


Ignore:
Timestamp:
Aug 22, 2015, 3:30:24 PM (5 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
71e9a5c, 89f863f
Parents:
ae29683 (diff), a1c4c2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Imported Upstream version 0.7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_cache.c

    rae29683 r4addf74  
    33 *  Copyright 2008 Nikos Mavrogiannopoulos
    44 *  Copyright 2011 Dash Shendy
     5 *  Copyright 2015 Thomas Klute
    56 *
    67 *  Licensed under the Apache License, Version 2.0 (the "License");
     
    4546#endif
    4647
     48#ifdef APLOG_USE_MODULE
     49APLOG_USE_MODULE(gnutls);
     50#endif
     51
    4752char *mgs_session_id2sz(unsigned char *id, int idlen,
    4853        char *str, int strsize) {
     
    576581}
    577582
    578 int mgs_cache_child_init(apr_pool_t * p, server_rec * s,
    579         mgs_srvconf_rec * sc) {
     583#if HAVE_APR_MEMCACHE
     584int mgs_cache_child_init(apr_pool_t * p,
     585                         server_rec * s,
     586                         mgs_srvconf_rec * sc)
     587#else
     588int mgs_cache_child_init(apr_pool_t * p __attribute__((unused)),
     589                         server_rec * s __attribute__((unused)),
     590                         mgs_srvconf_rec * sc)
     591#endif
     592{
    580593    if (sc->cache_type == mgs_cache_dbm
    581594            || sc->cache_type == mgs_cache_gdbm) {
Note: See TracChangeset for help on using the changeset viewer.