diff options
| author | Joe Orton <jorton@apache.org> | 2004-09-20 22:12:20 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-09-20 22:12:20 +0200 |
| commit | 91fdc42dc266273dd44841fb08189d9a19c09e0e (patch) | |
| tree | 8444a08f9cced28ca40f008a8d752b6136aa2089 /server | |
| parent | update transformation (diff) | |
| download | apache2-91fdc42dc266273dd44841fb08189d9a19c09e0e.tar.xz apache2-91fdc42dc266273dd44841fb08189d9a19c09e0e.zip | |
* server/core.c (merge_core_dir_configs): Fix Satisfy merging since
per-method Satisfy feature was added.
PR: 31315
Submitted by: Rici Lake <rici ricilake.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105215 13f79535-47bb-0310-9956-ffa450edef68
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]; } } |