From: Jim Jagielski Date: Thu, 9 Jan 2014 14:32:47 +0000 (+0000) Subject: Merge r1554995 from trunk: X-Git-Tag: 2.4.8~248 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b366f595f89074ff7614e627491318ceb98e581;p=apache Merge r1554995 from trunk: Providers defined in 'es to be seen from auth + stanzas under virtual hosts. PR 55622. [Eric Covener] + *) mod_proxy_fcgi: Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout. [Jan Kaluza] @@ -9,7 +12,7 @@ Changes with Apache 2.4.8 build/config-stubs. [Stefan Fritsch] *) mod_cache_disk: Fix potential hangs on Windows when using mod_cache_disk. - PR55833. [Eric Covener] + PR 55833. [Eric Covener] *) mod_ssl: Add support for OpenSSL configuration commands by introducing the SSLOpenSSLConfCmd directive. [Stephen Henson, Kaspar Brand] diff --git a/STATUS b/STATUS index cac3167362..dc7fce2a06 100644 --- a/STATUS +++ b/STATUS @@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_authn_core: allow 'es to be seen from auth - stanzas under virtual hosts. PR55622. - trunk patch: http://svn.apache.org/r1554995 - 2.4.x patch: trunk works, + CHANGES - +1: covener, druggeri, trawick PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c index 29d1988fb6..1f1163ec08 100644 --- a/modules/aaa/mod_authn_core.c +++ b/modules/aaa/mod_authn_core.c @@ -179,6 +179,12 @@ static void *create_authn_alias_svr_config(apr_pool_t *p, server_rec *s) return (void *) authcfg; } +/* Only per-server directive we have is GLOBAL_ONLY */ +static void *merge_authn_alias_svr_config(apr_pool_t *p, void *basev, void *overridesv) +{ + return basev; +} + static const authn_provider authn_alias_provider = { &authn_alias_check_password, @@ -373,7 +379,7 @@ AP_DECLARE_MODULE(authn_core) = create_authn_core_dir_config, /* dir config creater */ merge_authn_core_dir_config, /* dir merger --- default is to override */ create_authn_alias_svr_config, /* server config */ - NULL, /* merge server config */ + merge_authn_alias_svr_config, /* merge server config */ authn_cmds, register_hooks /* register hooks */ };