diff options
| author | Yann Ylavic <ylavic@apache.org> | 2015-06-30 00:12:52 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2015-06-30 00:12:52 +0000 |
| commit | 7ba006d91a9dbe43624916269b35430ca3c57ad7 (patch) | |
| tree | 8e818db88b31214daba69a6aa6301c5167df5b2c | |
| parent | f30252553d43cdfd2d08c7dbbe892f54f8ad6bba (diff) | |
| download | httpd-7ba006d91a9dbe43624916269b35430ca3c57ad7.tar.gz | |
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
| -rw-r--r-- | STATUS | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 |