Blame SOURCES/httpd-2.4.6-r1618851.patch

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