From: Jim Jagielski <jim@apache.org>
Date: Wed, 15 Feb 2017 16:40:28 +0000 (+0000)
Subject: Update... one show stopper was fixed, the other has 2 votes.
X-Git-Tag: 2.4.26~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc62df719e0ef32f54fe1da5eb0738835a66c243;p=thirdparty%2Fapache%2Fhttpd.git

Update... one show stopper was fixed, the other has 2 votes.


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

diff --git a/CHANGES b/CHANGES
index 810e653b1d3..2b44410c247 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,7 +31,7 @@ Changes with Apache 2.4.26
   *) mod_proxy: Allow the per-request environment variable "no-proxy" to
      be used as an alternative to ProxyPass /path !. This is primarily
      to set exceptions for ProxyPass specified in <Location> context.
-     Use SetEnvIf, not SetEnv.
+     Use SetEnvIf, not SetEnv. PR 60458.
 
   *) mod_http2: fixes PR60599, sending proper response for conditional requests
      answered by mod_cache. [Jeff Wheelhouse, Stefan Eissing]
diff --git a/STATUS b/STATUS
index 32c4713fceb..0a35fe9a013 100644
--- a/STATUS
+++ b/STATUS
@@ -115,14 +115,11 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-  *) PR 60071: Child httpd processes crash with Segmentation fault
+  *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are
+     in use (ProxyHCTPsize > 0).  PR 60071.
      trunk patch: http://svn.apache.org/r1779573
-                  http://svn.apache.org/r1779574
-                  http://svn.apache.org/r1779623
-     2.4.x patch: trunk works
-     +1: jim
-
-  *) PR60458: Rip out this regression or fix (TBD)
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, jim
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
@@ -188,12 +185,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mod_ssl-restart_leaks-v2.patch
      +1: ylavic, jim
 
-  *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are
-     in use (ProxyHCTPsize > 0).  PR 60071.
-     trunk patch: http://svn.apache.org/r1779573
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, jim
-
   *) mod_proxy_hcheck: Don't validate timed out responses.
      trunk patch: http://svn.apache.org/r1779574
                   http://svn.apache.org/r1779623