Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1688428 - /httpd/httpd/branches/2.4.x/STATUS
Date: Tue, 30 Jun 2015 11:14:54 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20150630111454.2919CAC0665@hades.apache.org>

Author: ylavic
Date: Tue Jun 30 11:14:53 2015
New Revision: 1688428

URL: http://svn.apache.org/r1688428
Log:
Remove verbose/confusing notes.

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1688428&r1=1688427&r2=1688428&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jun 30 11:14:53 2015
@@ -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.