Merge r1554995 from trunk:

Providers defined in <AuthnProviderAlias have not been usable under
in virtual hosts since migrating from mod_authn_alias to mod_authn_core.
PR 55622.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556818 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 80c5e669db880d350b0b9af42c0b17cb06553051..aa745101e0530bec1605fdea299bf6c487eb796d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.8
 
+  *) mod_authn_core: Allow <AuthnProviderAlias>'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 cac3167362d7f04cb9887e080999b6544477d8db..dc7fce2a0692c78e5fa7e6143118f5ca0b165065 100644 (file)
--- 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 <AuthnProviderAlias>'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 29d1988fb6df64f1bec8d75f61ab5cd4d9dff5df..1f1163ec086280e63c03f22e9c032edcd26f6251 100644 (file)
--- 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 */
 };