Changeset 436 for server/common


Ignore:
Timestamp:
Oct 1, 2007, 6:25:38 PM (15 years ago)
Author:
andersk
Message:
Fix dir config merging in mod_auth_sslcert.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • server/common/oursrc/httpdmods/mod_auth_sslcert.c

    r390 r436  
    11/* mod_auth_sslcert
    2  * version 1.1, released 2007-09-01 [NOT RELEASED YET]
     2 * version 1.1.1, released 2007-10-01
    33 * Anders Kaseorg <andersk@mit.edu>
    44 *
     
    3636    auth_sslcert_config_rec *conf = apr_pcalloc(p, sizeof(*conf));
    3737
    38     conf->authoritative = 1;
     38    conf->authoritative = -1;
    3939    conf->var = NULL;
    4040    conf->strip_suffix = NULL;
    41     conf->strip_suffix_required = 1;
     41    conf->strip_suffix_required = -1;
    4242
    4343    return conf;
     
    4949        *conf = apr_pcalloc(p, sizeof(*conf));
    5050
    51     conf->authoritative = nconf->authoritative;
    52     conf->var = (nconf->var != NULL) ? nconf->var : pconf->var;
     51    conf->authoritative = (nconf->authoritative != -1) ?
     52        nconf->authoritative : pconf->authoritative;
     53    conf->var = (nconf->var != NULL) ?
     54        nconf->var : pconf->var;
    5355    conf->strip_suffix = (nconf->var != NULL || nconf->strip_suffix != NULL) ?
    5456        nconf->strip_suffix : pconf->strip_suffix;
     57    conf->strip_suffix_required = (nconf->var != NULL || nconf->strip_suffix_required != -1) ?
     58        nconf->authoritative : pconf->authoritative;
    5559
    5660    return conf;
Note: See TracChangeset for help on using the changeset viewer.