You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jk...@apache.org on 2014/09/19 15:22:10 UTC
svn commit: r1626203 - in /httpd/httpd/branches/2.4.x: CHANGES
modules/aaa/mod_authz_core.c
Author: jkaluza
Date: Fri Sep 19 13:22:09 2014
New Revision: 1626203
URL: http://svn.apache.org/r1626203
Log:
Merge r1618851 from trunk: mod_authz_core: Allow <AuthzProviderAlias>'es
to be seen from auth stanzas under virtual hosts. PR 56870. [Eric Covener]
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1626203&r1=1626202&r2=1626203&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Sep 19 13:22:09 2014
@@ -34,6 +34,9 @@ Changes with Apache 2.4.11
*) mod_lua: Don't quote Expires and Path values. PR 56734.
[Keith Mashinter, <kmashint yahoo com>]
+ *) mod_authz_core: Allow <AuthzProviderAlias>'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)
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c?rev=1626203&r1=1626202&r2=1626203&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c Fri Sep 19 13:22: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;
@@ -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 */
};