diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/core.c b/server/core.c index e5cb1880a4..1e5a34ad91 100644 --- a/server/core.c +++ b/server/core.c @@ -353,9 +353,13 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) /* Otherwise we simply use the base->sec_file array */ + /* use a separate ->satisfy[] array either way */ + conf->satisfy = apr_palloc(a, sizeof(*conf->satisfy) * METHODS); for (i = 0; i < METHODS; ++i) { if (new->satisfy[i] != SATISFY_NOSPEC) { conf->satisfy[i] = new->satisfy[i]; + } else { + conf->satisfy[i] = base->satisfy[i]; } } |