You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by yl...@apache.org on 2015/06/30 13:13:37 UTC

svn commit: r1688427 - /httpd/httpd/branches/2.2.x/STATUS

Author: ylavic
Date: Tue Jun 30 11:13:37 2015
New Revision: 1688427

URL: http://svn.apache.org/r1688427
Log:
Add Bill's fixes to SubstituteInheritBefore proposal.

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1688427&r1=1688426&r2=1688427&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Jun 30 11:13:37 2015
@@ -117,16 +117,12 @@ 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-v3.patch
+                  http://svn.apache.org/r1688331
+                  http://svn.apache.org/r1688339
+                  http://svn.apache.org/r1688340
+                  http://svn.apache.org/r1688343
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v4.patch
      +1: ylavic
-     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