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

    r32538ff r040387c  
    184184    .merge_dir_config = mgs_config_dir_merge,
    185185    .create_server_config = mgs_config_server_create,
     186    .merge_server_config = mgs_config_server_merge,
    186187    .cmds = mgs_config_cmds,
    187188    .register_hooks = gnutls_hooks
Note: See TracChangeset for help on using the changeset viewer.