From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 30 Jun 2015 11:14:53 +0000 (+0000)
Subject: Remove verbose/confusing notes.
X-Git-Tag: 2.4.16~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b4911b726fd2866af3fd6332c5347bde0e5a49c;p=thirdparty%2Fapache%2Fhttpd.git

Remove verbose/confusing notes.

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

diff --git a/STATUS b/STATUS
index c3b8750d281..3e0dc228cb8 100644
--- a/STATUS
+++ b/STATUS
@@ -226,13 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1688343
      2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v4.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 => over->inherit_before = (base->inherit_before != 0) instead
-             of (base->inherit_before > 0), plus the doc updated accordingly.
-             Added r1688331 and following wrowe's commits to address the -1.
 
   *) core: Avoid a possible truncation of the faulty header included in the
      HTML response when LimitRequestFieldSize is reached.