From 645e929ca70b94b93d41bb04d917a9bcb8c53124 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Kalu=C5=BEa?= Date: Fri, 19 Sep 2014 13:22:09 +0000 Subject: [PATCH] Merge r1618851 from trunk: mod_authz_core: Allow 'es to be seen from auth stanzas under virtual hosts. PR 56870. [Eric Covener] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1626203 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/aaa/mod_authz_core.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index e4d8bfc662..4d864ac4be 100644 --- a/CHANGES +++ b/CHANGES @@ -34,6 +34,9 @@ Changes with Apache 2.4.11 *) mod_lua: Don't quote Expires and Path values. PR 56734. [Keith Mashinter, ] + *) mod_authz_core: Allow 'es to be seen from auth + stanzas under virtual hosts. PR 56870. [Eric Covener] + Changes with Apache 2.4.10 *) SECURITY: CVE-2014-0117 (cve.mitre.org) diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index c9ed22ff1c..c68b56bd31 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; @@ -1140,7 +1147,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.40.0