From 2786c228804f2a1e080649ae7b41a81d1a948a3e Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 30 Jun 2015 11:02:23 +0000 Subject: [PATCH] Add Bill's fixes to SubstituteInheritBefore proposal. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1688422 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/STATUS b/STATUS index f1769dd608..c3b8750d28 100644 --- a/STATUS +++ b/STATUS @@ -221,7 +221,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1687539 http://svn.apache.org/r1687680 http://svn.apache.org/r1688331 - 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v3.patch + http://svn.apache.org/r1688339 + http://svn.apache.org/r1688340 + 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 @@ -229,8 +232,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 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). + 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. -- 2.50.1