Attachment 930390 Details for Bug 1131847 – Patch for mod_authz_corez

[patch] Patch for mod_authz_corez

httpd-2.4.6-r1618851.patch (text/plain), 977 bytes, created by Sébastien Andreatta on 2014-08-25 09:05:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sébastien Andreatta

Created: 2014-08-25 09:05:28 UTC

Size: 977 bytes

patch

obsolete

># ./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 */
> };

Actions: View | Diff

Attachments on bug 1131847: 928658 | 930390