]> granicus.if.org Git - apache/commitdiff
* Inherit providers during merging
authorRuediger Pluem <rpluem@apache.org>
Thu, 28 Mar 2013 19:28:43 +0000 (19:28 +0000)
committerRuediger Pluem <rpluem@apache.org>
Thu, 28 Mar 2013 19:28:43 +0000 (19:28 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1462266 13f79535-47bb-0310-9956-ffa450edef68

modules/aaa/mod_auth_basic.c

index fe2c3a42481f0390fe877b0eb081180a90c6002c..9d451b63443dc3d7412c53a18ddb9be6d77a9258 100644 (file)
@@ -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;
 }