]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
This patch is a no-go, will defer to post-2.2.30
authorWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 29 Jun 2015 22:54:31 +0000 (22:54 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 29 Jun 2015 22:54:31 +0000 (22:54 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688325 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index a82922531e164f36fe9a5ede0a6ebcfa8f0a2080..0bc2e86f5b07767ced1d4f07033d7ff7fa63b885 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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+),