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

Note discarded vote and refer to 2.2.x instead of 2.4.x for the backport. 

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

STATUS

+5 −4
Original line number Diff line number Diff line
@@ -111,10 +111,11 @@ 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

     ylavic: 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

             => over->inherit_before = (base->inherit_before != 0) instead

     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.



PATCHES/ISSUES THAT ARE STALLED