From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 26 Jun 2015 07:19:34 +0000 (+0000)
Subject: Update mod_substitute proposal with r1687680 and v2.
X-Git-Tag: 2.4.16~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ba7134419cf77888d952253d3cdf1de8b4dab3e;p=apache

Update mod_substitute proposal with r1687680 and v2.

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

diff --git a/STATUS b/STATUS
index dd0d6c999b..44c5db6921 100644
--- a/STATUS
+++ b/STATUS
@@ -204,14 +204,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_substitute: Configure patterns merge order. PR 57641
      trunk patch: http://svn.apache.org/r1684900
                   http://svn.apache.org/r1687539 
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore.patch
+                  http://svn.apache.org/r1687680
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v2.patch
      +1: ylavic
      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 (dcfg->inherit_before = 1 by default, and the doc is updated
-             accordingly).
+             only => over->inherit_before = (base->inherit_before != 0) instead
+			 of (base->inherit_before > 0), plus the doc updated accordingly.
 
   *) core: Avoid a possible truncation of the faulty header included in the
      HTML response when LimitRequestFieldSize is reached.