From: Ruediger Pluem Date: Thu, 28 Mar 2013 19:28:43 +0000 (+0000) Subject: * Inherit providers during merging X-Git-Tag: 2.5.0-alpha~5639 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8d1cc69df754ed6b449f007b6817e5ac7b17bdb;p=apache * Inherit providers during merging git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1462266 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c index fe2c3a4248..9d451b6344 100644 --- a/modules/aaa/mod_auth_basic.c +++ b/modules/aaa/mod_auth_basic.c @@ -70,6 +70,8 @@ static void *merge_auth_basic_dir_config(apr_pool_t *p, void *basev, void *overr overrides->fake_set ? overrides->fakepass : base->fakepass; newconf->fake_set = overrides->fake_set || base->fake_set; + newconf->providers = overrides->providers ? overrides->providers : base->providers; + return newconf; }