Commit d24e9d96 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Address wrowe's -1. 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688333 13f79535-47bb-0310-9956-ffa450edef68
parent fe5a65da

STATUS

+4 −3
Original line number Diff line number Diff line
@@ -117,15 +117,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     trunk patch: http://svn.apache.org/r1684900

                  http://svn.apache.org/r1687539 

                  http://svn.apache.org/r1687680

     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v2.patch

     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v3.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

     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+),

             but still On in 2.2.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).



PATCHES/ISSUES THAT ARE STALLED