From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 29 Jun 2015 23:44:28 +0000 (+0000)
Subject: mod_substitute: follow up to r1687680.
X-Git-Tag: 2.5.0-alpha~3036
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fa18eedfef005c1580081bed06b4597cbf92752;p=apache

mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688331 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index efd1a06c68..648f7de282 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -86,10 +86,9 @@ static void *merge_substitute_dcfg(apr_pool_t *p, void *basev, void *overv)
     subst_dir_conf *base = (subst_dir_conf *) basev;
     subst_dir_conf *over = (subst_dir_conf *) overv;
 
-    if (over->inherit_before < 0) {
-        over->inherit_before = (base->inherit_before > 0);
-    }
-    if (over->inherit_before) {
+    a->inherit_before = (over->inherit_before > 0 || (over->inherit_before < 0 &&
+                                                      base->inherit_before > 0));
+    if (a->inherit_before) {
         a->patterns = apr_array_append(p, base->patterns,
                                           over->patterns);
     }