From: Graham Leggett <minfrin@apache.org>
Date: Tue, 22 Jun 2021 07:38:49 +0000 (+0000)
Subject: Propose.
X-Git-Tag: candidate-2.4.49~3^2~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26d9450782754272c1b10cbcf757e4450f949c18;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


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

diff --git a/STATUS b/STATUS
index 31a364a38c1..9fde8a7be5a 100644
--- a/STATUS
+++ b/STATUS
@@ -174,6 +174,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions3.patch
      +1: minfrin
 
+  *) back port: Add CPING to health check logic - remove hardcoded timeout.
+     Trunk version of patch:
+        https://svn.apache.org/r1887439
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1887439 ^/httpd/httpd/trunk .
+     +1: minfrin
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]