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 810e653b1d341a20cf364eefe876894e7212cff3..2b44410c24774d2fb0d30508bbf95f0f8b7c4c27 100644 (file)
--- 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 32c4713fceb5a5ce53ca2d23a5bd0be6859837b9..0a35fe9a013a3877b948d8a4deb3b59b0e79a6df 100644 (file)
--- 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