From 278abfe12610b45aff85436cba3a6568ace49275 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 25 Jun 2015 15:47:39 +0000 Subject: [PATCH] Update mod_substitute proposal with SubstituteInheritBefore. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1687564 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/STATUS b/STATUS index cc41f99247..dd0d6c999b 100644 --- a/STATUS +++ b/STATUS @@ -201,10 +201,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: ints added at the end of core_server_config, the proposed merge does a minor bump only. - *) mod_substitute: Fix configuraton merge order. PR 57641 + *) mod_substitute: Configure patterns merge order. PR 57641 trunk patch: http://svn.apache.org/r1684900 - 2.4.x patch: trunk works (modulo CHANGES) - +1: ylavic, minfrin + http://svn.apache.org/r1687539 + 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore.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). *) core: Avoid a possible truncation of the faulty header included in the HTML response when LimitRequestFieldSize is reached. -- 2.50.1