Changeset 040387c in mod_gnutls for include


Ignore:
Timestamp:
Jan 29, 2013, 8:05:42 PM (5 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
  • include/mod_gnutls.h.in

    r32538ff r040387c  
    5050#define GNUTLS_ENABLED_FALSE 0
    5151#define GNUTLS_ENABLED_TRUE  1
     52#define GNUTLS_ENABLED_UNSET  2
    5253/* Current module version */
    5354#define MOD_GNUTLS_VERSION "0.5.10"
     
    7576#if HAVE_APR_MEMCACHE
    7677        /* Use Memcache */
    77     mgs_cache_memcache
     78    mgs_cache_memcache,
    7879#endif
     80    mgs_cache_unset
    7981} mgs_cache_e;
    8082
     
    355357                                    void *mconfig, const char *arg);
    356358void *mgs_config_server_create(apr_pool_t * p, server_rec * s);
     359void *mgs_config_server_merge(apr_pool_t *p, void *BASE, void *ADD);
    357360
    358361void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv);
Note: See TracChangeset for help on using the changeset viewer.