From: Eric Covener <covener@apache.org>
Date: Mon, 9 Jan 2023 13:28:33 +0000 (+0000)
Subject: Merge r1889936 from trunk:
X-Git-Tag: 2.4.55-rc1-candidate~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa88fb40950805f9edcaeabee6a6205ea5536651;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1889936 from trunk:

    mod_proxy_hcheck: Honor worker timeout settings.

    Daniel reported on user@ that hc connections do not timeout according to
    the worker's tumeout= configuration, this fixes it.

    While at it, copy the other timeout settings too.

    Reported by: dferradal


Submitted By: rpluem
Reviewed By: rpluem, jorton, jim


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

diff --git a/STATUS b/STATUS
index 555776edace..c07c192ea5d 100644
--- a/STATUS
+++ b/STATUS
@@ -160,14 +160,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: manu, covener, gbechis
      covener: xml needs doc tweak after backport
 
-  *) mod_proxy_hcheck: Honor worker timeout settings
-     Trunk version of patch:
-        https://svn.apache.org/r1889936
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1889936 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/changes-entries/hc_timeouts.txt b/changes-entries/hc_timeouts.txt
new file mode 100644
index 00000000000..50992bf40ae
--- /dev/null
+++ b/changes-entries/hc_timeouts.txt
@@ -0,0 +1 @@
+  *) mod_proxy_hcheck: Honor worker timeout settings.  [Yann Ylavic]
\ No newline at end of file
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 753a709d95e..d618b4dfb69 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -512,10 +512,12 @@ static proxy_worker *hc_get_hcworker(sctx_t *ctx, proxy_worker *worker,
         hc->hash.fnv = hc->s->hash.fnv = ap_proxy_hashfunc(hc->s->name_ex,
                                                            PROXY_HASHFUNC_FNV);
         hc->s->port = port;
-        if (worker->s->conn_timeout_set) {
-            hc->s->conn_timeout_set = worker->s->conn_timeout_set;
-            hc->s->conn_timeout = worker->s->conn_timeout;
-        }
+        hc->s->conn_timeout_set = worker->s->conn_timeout_set;
+        hc->s->conn_timeout = worker->s->conn_timeout;
+        hc->s->ping_timeout_set = worker->s->ping_timeout_set;
+        hc->s->ping_timeout = worker->s->ping_timeout;
+        hc->s->timeout_set = worker->s->timeout_set;
+        hc->s->timeout = worker->s->timeout;
         /* Do not disable worker in case of errors */
         hc->s->status |= PROXY_WORKER_IGNORE_ERRORS;
         /* Mark as the "generic" worker */