From b570764720f23b747dc56be2078cf5cf088d5d88 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Mon, 29 Jun 2015 22:56:03 +0000 Subject: [PATCH] Similarly, wouldn't hold up 2.4.next for this not-ready patch git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1688326 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 1 + 1 file changed, 1 insertion(+) diff --git a/STATUS b/STATUS index 0f9a7f32ee..564f77f9ee 100644 --- a/STATUS +++ b/STATUS @@ -214,6 +214,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1687680 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v2.patch +1: ylavic + -1: wrowe - dir merge corrupts RHS config, must be const, a-> is result 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+), -- 2.40.0