Changeset 040387c in mod_gnutls for src/gnutls_hooks.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_hooks.c

    r32538ff r040387c  
    344344        sc->cache_type = sc_base->cache_type;
    345345        sc->cache_config = sc_base->cache_config;
     346        sc->cache_timeout = sc_base->cache_timeout;
     347
     348        /* defaults for unset values: */
     349        if (sc->enabled == GNUTLS_ENABLED_UNSET)
     350            sc->enabled = GNUTLS_ENABLED_FALSE;
     351        if (sc->tickets ==  GNUTLS_ENABLED_UNSET)
     352            sc->tickets = GNUTLS_ENABLED_TRUE;
     353        if (sc->client_verify_mode ==  -1)
     354            sc->client_verify_mode = GNUTLS_CERT_IGNORE;
     355
    346356
    347357        /* Check if the priorities have been set */
Note: See TracChangeset for help on using the changeset viewer.