Apply CHANGES and axe backported entries. [skip ci]

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

diff --git a/CHANGES b/CHANGES
index 0094e9e42b68177809af2f5732a4b3d1d2cc708a..3185214e9a1f969adcfcafe65e31a78ecf999d2b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.47
 
+  *) mod_proxy_hcheck: Don't pile up health checks if the previous one did
+     not finish before hcinterval.  PR 63010.  [Yann Ylavic]
+
   *) mod_session: Improve session parsing.  [Yann Yalvic]
 
   *) mod_authnz_ldap: Prevent authentications with empty passwords for the

diff --git a/STATUS b/STATUS
index bd7cf5692cc03164b4e22bb87371d84956019042..74b539deea0046af64d8636b27315674d0294e66 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -169,21 +169,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      CI results:  https://travis-ci.com/github/apache/httpd/builds/213760432
      +1: jorton, ylavic, icing 
 
-  *) mod_proxy_hcheck: Don't pile up health checks if the previous one did
-     not finish before hcinterval.  PR 63010.
-     trunk patch: http://svn.apache.org/r1885691
-     2.4.x patch: svn merge -c 1885691 ^/httpd/httpd/trunk .
-     +1: ylavic, covener, icing
-
-  *) mod_proxy_http, core: Fixes against 2.4.x's r1885239 and r1885573, the
-     former for declining CONNECT requests in mod_proxy_http, the latter for
-     ignored poll timeouts and errors in the core output filter.
-     trunk patch: http://svn.apache.org/r1886141
-                  http://svn.apache.org/r1886151
-     2.4.x patch: http://home.apache.org/~ylavic/patches/follow_up_to_r1885239_and_r1885573-v2.patch
-                  (includes follow up to r1885573 which is 2.4.x only)
-     +1: ylavic, covener, icing
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/changes-entries/proxy_hcheck_concurrent.txt b/changes-entries/proxy_hcheck_concurrent.txt
deleted file mode 100644 (file)
index 73af100..0000000
--- a/changes-entries/proxy_hcheck_concurrent.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_proxy_hcheck: Don't pile up health checks if the previous one did
-     not finish before hcinterval.  PR 63010.  [Yann Ylavic]
-