From: Jacob Champion <jchampion@apache.org>
Date: Fri, 24 Mar 2017 18:02:48 +0000 (+0000)
Subject: CHANGES: backported features to 2.4.x
X-Git-Tag: 2.5.0-alpha~532
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b193e0b7ff4995865660003f3666b04a35cc69e3;p=thirdparty%2Fapache%2Fhttpd.git

CHANGES: backported features to 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788512 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 6fd2c7cca7e..1a5e67658a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,11 +19,6 @@ Changes with Apache 2.5.0
   *) MPMs unix: Place signals handlers and helpers out of DSOs to avoid
      a possible crash if a signal is caught during (graceful) restart.
      PR 60487.  [Yann Ylavic]
-
-  *) mod_cache: Fix a regression in 2.4.25 for the forward proxy case by
-     computing and using the same entity key according to when the cache
-     checks, loads and saves the request.
-     PR 60577.  [Yann Ylavic]
   
   *) mod_proxy: Allow the per-request environment variable "no-proxy" to
      be used as an alternative to ProxyPass /path !. This is primarily
@@ -36,9 +31,6 @@ Changes with Apache 2.5.0
 
   *) mod_proxy_hcheck: Don't validate timed out responses.  [Yann Ylavic]
 
-  *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are
-     in use (ProxyHCTPsize > 0).  PR 60071.  [Yann Ylavic, Jim Jagielski]
-
   *) mod_proxy_fcgi: Return to 2.4.20-and-earlier behavior of leaving
      a "proxy:fcgi://" prefix in the SCRIPT_FILENAME environment variable by
      default.  Add ProxyFCGIBackendType to allow the type of backend to be