75a229
# ./pullrev.sh r1556818
75a229
http://svn.apache.org/viewvc?view=revision&revision=r1556818
75a229
--- httpd-2.4.6/modules/aaa/mod_authn_core.c	2014/01/09 14:30:23	1556817
75a229
+++ httpd-2.4.6/modules/aaa/mod_authn_core.c	2014/01/09 14:32:47	1556818
75a229
@@ -179,6 +179,12 @@
75a229
     return (void *) authcfg;
75a229
 }
75a229
 
75a229
+/* Only per-server directive we have is GLOBAL_ONLY */
75a229
+static void *merge_authn_alias_svr_config(apr_pool_t *p, void *basev, void *overridesv)
75a229
+{
75a229
+    return basev;
75a229
+}
75a229
+
75a229
 static const authn_provider authn_alias_provider =
75a229
 {
75a229
     &authn_alias_check_password,
75a229
@@ -373,7 +379,7 @@
75a229
     create_authn_core_dir_config,   /* dir config creater */
75a229
     merge_authn_core_dir_config,    /* dir merger --- default is to override */
75a229
     create_authn_alias_svr_config,  /* server config */
75a229
-    NULL,                           /* merge server config */
75a229
+    merge_authn_alias_svr_config,   /* merge server config */
75a229
     authn_cmds,
75a229
     register_hooks                  /* register hooks */
75a229
 };