From d952a0912f40d90085f12285fcfa35672c7b4ed4 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Tue, 19 Aug 2014 12:44:09 +0000 Subject: [PATCH] PR56870: authzprovideralias-defined authz provier can't be used in a virtualhost apply the same workaround from mod_authn_core r1554995 so r->server has our hash. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1618851 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_authz_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index e2fad4cd88..d70e6965cf 100644 --- a/modules/aaa/mod_authz_core.c +++ b/modules/aaa/mod_authz_core.c @@ -168,6 +168,13 @@ static void *merge_authz_core_dir_config(apr_pool_t *p, return (void*)conf; } +/* Only per-server directive we have is GLOBAL_ONLY */ +static void *merge_authz_core_svr_config(apr_pool_t *p, + void *basev, void *newv) +{ + return basev; +} + static void *create_authz_core_svr_config(apr_pool_t *p, server_rec *s) { authz_core_srv_conf *authcfg; @@ -1150,7 +1157,7 @@ AP_DECLARE_MODULE(authz_core) = create_authz_core_dir_config, /* dir config creater */ merge_authz_core_dir_config, /* dir merger */ create_authz_core_svr_config, /* server config */ - NULL, /* merge server config */ + merge_authz_core_svr_config , /* merge server config */ authz_cmds, register_hooks /* register hooks */ }; -- 2.50.1