Commit aca034b9 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent ff7f5daf
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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+),