You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
977 B
28 lines
977 B
# ./pullrev.sh r1618851 |
|
http://svn.apache.org/viewvc?view=revision&revision=r1618851 |
|
|
|
--- httpd-2.4.6/modules/aaa/mod_authz_core.c |
|
+++ httpd-2.4.6/modules/aaa/mod_authz_core.c |
|
@@ -168,6 +168,13 @@ |
|
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 +1148,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 */ |
|
};
|
|
|