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