From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 30 Jun 2015 00:04:18 +0000 (+0000)
Subject: Address wrowe's -1.
X-Git-Tag: 2.4.16~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e3d68088b9e51434212356047b1219dffa0cc2f;p=apache

Address wrowe's -1.

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

diff --git a/STATUS b/STATUS
index 564f77f9ee..8dab1ad111 100644
--- a/STATUS
+++ b/STATUS
@@ -212,15 +212,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1684900
                   http://svn.apache.org/r1687539 
                   http://svn.apache.org/r1687680
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v2.patch
+                  http://svn.apache.org/r1688331
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v3.patch
      +1: ylavic
-     -1: wrowe - dir merge corrupts RHS config, must be const, a-> is result
-     ylavic: added r1687539 and discarded minfrin's vote (we must preserve
+     ylavic: Added r1687539 and discarded 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.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.
+             Added r1688331 to fix 'over'-write while merging (addresses -1
+             from wrowe).
 
   *) core: Avoid a possible truncation of the faulty header included in the
      HTML response when LimitRequestFieldSize is reached.