From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 21 Aug 2015 14:19:17 +0000 (+0000)
Subject: mod_substitute: follow up r1684900.
X-Git-Tag: 2.5.0-alpha~2937
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f5e96113e82a316d23c63763eee136566fc66e4;p=thirdparty%2Fapache%2Fhttpd.git

mod_substitute: follow up r1684900.
Really inherit before when asked to (inverse if/else contents).

[reverted by r1697007]


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

diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 87621975209..a7d81caba0f 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -97,13 +97,13 @@ static void *merge_substitute_dcfg(apr_pool_t *p, void *basev, void *overv)
      * 'off' to follow the corrected/expected behavior, without violating POLS.
      */
     if (a->inherit_before == 1) {
-        a->patterns = apr_array_append(p, base->patterns,
-                                          over->patterns);
-    }
-    else {
         a->patterns = apr_array_append(p, over->patterns,
                                           base->patterns);
     }
+    else {
+        a->patterns = apr_array_append(p, base->patterns,
+                                          over->patterns);
+    }
     a->max_line_length = over->max_line_length_set ?
                              over->max_line_length : base->max_line_length;
     a->max_line_length_set = over->max_line_length_set