diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2015-06-29 22:54:31 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2015-06-29 22:54:31 +0000 |
| commit | f30252553d43cdfd2d08c7dbbe892f54f8ad6bba (patch) | |
| tree | e78515adcb8777460d8c55af5d8ddc16b340bbbb | |
| parent | 38fe0d2ea8bcb8db5325de70975c8f505932af09 (diff) | |
| download | httpd-f30252553d43cdfd2d08c7dbbe892f54f8ad6bba.tar.gz | |
This patch is a no-go, will defer to post-2.2.30
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688325 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | STATUS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -119,6 +119,7 @@ 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 + -1: wrowe - dir merge corrupts RHS config, must be const, a-> is result 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+), |