From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 21 Aug 2015 16:40:44 +0000 (+0000)
Subject: Also update SubstituteInheritBefore proposal to v5 in 2.2.x.
X-Git-Tag: 2.2.32~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e54f40da7a395c384279425c0a412ac45355aa2b;p=thirdparty%2Fapache%2Fhttpd.git

Also update SubstituteInheritBefore proposal to v5 in 2.2.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1697026 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 1523a5cb405..da5237d9fe4 100644
--- a/STATUS
+++ b/STATUS
@@ -124,9 +124,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   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
+                  http://svn.apache.org/r1697013
+                  http://svn.apache.org/r1697015
+     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v5.patch
      +1: ylavic
      rpluem: Doesn't that change the previous behaviour if SubstituteInheritBefore is not set?
+     ylavic: yes thanks, updated to v5 including r1697013 and r1697015,
+             the diff to v4 is:
+             http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v4_vs_v5.diff
 
   *) mod_proxy: Fix a race condition that caused a failed worker to be retried
      before the retry period is over