httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1618851 - /httpd/httpd/trunk/modules/aaa/mod_authz_core.c
Date Tue, 19 Aug 2014 12:44:10 GMT
Author: covener
Date: Tue Aug 19 12:44:09 2014
New Revision: 1618851

URL: http://svn.apache.org/r1618851
Log:
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.


Modified:
    httpd/httpd/trunk/modules/aaa/mod_authz_core.c

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=1618851&r1=1618850&r2=1618851&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Tue Aug 19 12:44:09 2014
@@ -168,6 +168,13 @@ static void *merge_authz_core_dir_config
     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 */
 };



Mime
View raw message