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

This patch is a no-go, will defer to post-2.2.30

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688325 13f79535-47bb-0310-9956-ffa450edef68
parent 5056bdae
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  http://svn.apache.org/r1687680
     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v2.patch
     +1: ylavic
     -1: wrowe - dir merge corrupts RHS config, must be const, a-> is result
     ylavic: added r1687539 and r1687680 discarding minfrin's vote (we must
             preserve the current behaviour). SubstituteInheritBefore allows to
             configure the merge order; the default is Off in trunk (2.5+),