From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 26 Jun 2015 07:38:39 +0000 (+0000)
Subject: Update mod_substitute proposal with r1687539 and r1687680, plus the backport patch.
X-Git-Tag: 2.2.30~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342cb635e9baf609c42cec50ff92aa65c87eca01;p=thirdparty%2Fapache%2Fhttpd.git

Update mod_substitute proposal with r1687539 and r1687680, plus the backport patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687697 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 936f45fde24..430c994f394 100644
--- a/STATUS
+++ b/STATUS
@@ -105,11 +105,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
-  *) mod_substitute: Fix configuraton merge order. PR 57641
+  *) mod_substitute: Configure patterns merge order. PR 57641
      trunk patch: http://svn.apache.org/r1684900
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, minfrin
-     -1: wrowe [not without user control, we don't break working 2.2 configs]
+                  http://svn.apache.org/r1687539 
+                  http://svn.apache.org/r1687680
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v2.patch
+     +1: ylavic
+     ylavic: SubstituteInheritBefore allows to configure the merge order;
+             the default is Off in trunk (2.5+), but still On in 2.4.x thanks to
+             the changes in the backport patch only
+             => over->inherit_before = (base->inherit_before != 0) instead
+             of (base->inherit_before > 0), plus the doc updated accordingly.
 
 PATCHES/ISSUES THAT ARE STALLED