Blame SOURCES/httpd-2.4.6-r1618851.patch
|
 |
41a6c3 |
# ./pullrev.sh r1618851
|
|
|
41a6c3 |
http://svn.apache.org/viewvc?view=revision&revision=r1618851
|
|
|
41a6c3 |
|
|
|
41a6c3 |
--- httpd-2.4.6/modules/aaa/mod_authz_core.c
|
|
|
41a6c3 |
+++ httpd-2.4.6/modules/aaa/mod_authz_core.c
|
|
|
41a6c3 |
@@ -168,6 +168,13 @@
|
|
|
41a6c3 |
return (void*)conf;
|
|
|
41a6c3 |
}
|
|
|
41a6c3 |
|
|
|
41a6c3 |
+/* Only per-server directive we have is GLOBAL_ONLY */
|
|
|
41a6c3 |
+static void *merge_authz_core_svr_config(apr_pool_t *p,
|
|
|
41a6c3 |
+ void *basev, void *newv)
|
|
|
41a6c3 |
+{
|
|
|
41a6c3 |
+ return basev;
|
|
|
41a6c3 |
+}
|
|
|
41a6c3 |
+
|
|
|
41a6c3 |
static void *create_authz_core_svr_config(apr_pool_t *p, server_rec *s)
|
|
|
41a6c3 |
{
|
|
|
41a6c3 |
authz_core_srv_conf *authcfg;
|
|
|
41a6c3 |
@@ -1140,7 +1148,7 @@ AP_DECLARE_MODULE(authz_core) =
|
|
|
41a6c3 |
create_authz_core_dir_config, /* dir config creater */
|
|
|
41a6c3 |
merge_authz_core_dir_config, /* dir merger */
|
|
|
41a6c3 |
create_authz_core_svr_config, /* server config */
|
|
|
41a6c3 |
- NULL, /* merge server config */
|
|
|
41a6c3 |
+ merge_authz_core_svr_config , /* merge server config */
|
|
|
41a6c3 |
authz_cmds,
|
|
|
41a6c3 |
register_hooks /* register hooks */
|
|
|
41a6c3 |
};
|