From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 29 Jun 2015 22:54:31 +0000 (+0000)
Subject: This patch is a no-go, will defer to post-2.2.30
X-Git-Tag: 2.2.30~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f30252553d43cdfd2d08c7dbbe892f54f8ad6bba;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/STATUS b/STATUS
index a82922531e1..0bc2e86f5b0 100644
--- 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+),