Changeset 619c6bf in mod_gnutls for src/gnutls_config.c


Ignore:
Timestamp:
Jan 11, 2013, 12:58:18 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
2b1118c
Parents:
9c4a744 (diff), 17eb1a1 (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:

Merge tag 'upstream/0.5.9'

Upstream version 0.5.9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_config.c

    r9c4a744 r619c6bf  
    344344    }
    345345
    346     sc->cache_type = mgs_cache_none;
    347     if (strcasecmp("dbm", type) == 0) {
     346    if (strcasecmp("none", type) == 0) {
     347        sc->cache_type = mgs_cache_none;
     348    } else if (strcasecmp("dbm", type) == 0) {
    348349        sc->cache_type = mgs_cache_dbm;
     350    }
     351    else if (strcasecmp("gdbm", type) == 0) {
     352        sc->cache_type = mgs_cache_gdbm;
    349353    }
    350354#if HAVE_APR_MEMCACHE
     
    357361    }
    358362
    359     if (sc->cache_type == mgs_cache_dbm) {
     363    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
    360364        sc->cache_config = ap_server_root_relative(parms->pool, arg);
    361365    } else {
Note: See TracChangeset for help on using the changeset viewer.