From: Nick Kew <niq@apache.org>
Date: Thu, 11 Jun 2015 14:22:21 +0000 (+0000)
Subject: mod_substitute: Fix configuraton merge order.
X-Git-Tag: 2.5.0-alpha~3090
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a691e368a365afae80dc0e22390d0e0f1603bae4;p=thirdparty%2Fapache%2Fhttpd.git

mod_substitute: Fix configuraton merge order.
PR 57641 [Marc.Stern]


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

diff --git a/CHANGES b/CHANGES
index 5361e50fbed..2067dfa7d0f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_substitute: Fix configuraton merge order.
+     PR 57641 [<Marc.Stern approach.be>]
+
   *) core: Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
      authorized characters.  [Yann Ylavic]
 
diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 984249a2cf0..22f75dce56e 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -84,8 +84,8 @@ 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;
 
-    a->patterns = apr_array_append(p, over->patterns,
-                                                  base->patterns);
+    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 ?