From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 28 Mar 2013 19:28:43 +0000 (+0000)
Subject: * Inherit providers during merging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1b52d5f694cf045156ed9a98eb729b97e906f7c;p=thirdparty%2Fapache%2Fhttpd.git

* 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 fe2c3a42481..9d451b63443 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;
 }