diff options
| author | Yann Ylavic <ylavic@apache.org> | 2015-06-30 11:13:37 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2015-06-30 11:13:37 +0000 |
| commit | ed34d65ef36d9d803a7abb7696e2233bd2285be4 (patch) | |
| tree | 4571ef4978f48c60f9259539add951accdb7280e | |
| parent | 7ba006d91a9dbe43624916269b35430ca3c57ad7 (diff) | |
| download | httpd-ed34d65ef36d9d803a7abb7696e2233bd2285be4.tar.gz | |
Add Bill's fixes to SubstituteInheritBefore proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688427 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | STATUS | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -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 |