From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 30 Jun 2015 11:13:37 +0000 (+0000)
Subject: Add Bill's fixes to SubstituteInheritBefore proposal.
X-Git-Tag: 2.2.30~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed34d65ef36d9d803a7abb7696e2233bd2285be4;p=thirdparty%2Fapache%2Fhttpd.git

Add Bill's fixes to SubstituteInheritBefore proposal.


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

diff --git a/STATUS b/STATUS
index 959a9b71ed8..0298d6c4cf3 100644
--- a/STATUS
+++ b/STATUS
@@ -117,16 +117,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1684900
                   http://svn.apache.org/r1687539 
                   http://svn.apache.org/r1687680
-     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v3.patch
+                  http://svn.apache.org/r1688331
+                  http://svn.apache.org/r1688339
+                  http://svn.apache.org/r1688340
+                  http://svn.apache.org/r1688343
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v4.patch
      +1: ylavic
-     ylavic: Added r1687539 and r1687680 discarding minfrin's vote (we must
-             preserve the current behaviour). SubstituteInheritBefore allows to
-             configure the merge order; the default is Off in trunk (2.5+),
-             but still On in 2.2.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.
-             Added r1688331 to fix 'over'-write while merging (addresses -1
-             from wrowe).
 
 PATCHES/ISSUES THAT ARE STALLED