arrfab / rpms / httpd

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