Changeset 040387c in mod_gnutls for src/gnutls_cache.c


Ignore:
Timestamp:
Jan 29, 2013, 8:05:42 PM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
0367e02
Parents:
32538ff
git-author:
Daniel Kahn Gillmor <dkg@…> (01/27/13 03:53:01)
git-committer:
Daniel Kahn Gillmor <dkg@…> (01/29/13 20:05:42)
Message:

server-wide settings should be defaults unless overridden in a vhost

Previously, there was no merging possible; so if any directives were
set in a vhost, all other directives set from the server config would
be thrown away.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_cache.c

    r32538ff r040387c  
    561561int mgs_cache_post_config(apr_pool_t * p, server_rec * s,
    562562        mgs_srvconf_rec * sc) {
     563
     564    /* if GnuTLSCache was never explicitly set: */
     565    if (sc->cache_type == mgs_cache_unset)
     566        sc->cache_type = mgs_cache_none;
     567    /* if GnuTLSCacheTimeout was never explicitly set: */
     568    if (sc->cache_timeout == -1)
     569        sc->cache_timeout = apr_time_from_sec(300);
     570
    563571    if (sc->cache_type == mgs_cache_dbm
    564572            || sc->cache_type == mgs_cache_gdbm) {
Note: See TracChangeset for help on using the changeset viewer.