You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2023/01/09 13:28:33 UTC
svn commit: r1906499 - in /httpd/httpd/branches/2.4.x: ./ STATUS changes-entries/hc_timeouts.txt modules/proxy/mod_proxy_hcheck.c
Author: covener
Date: Mon Jan 9 13:28:33 2023
New Revision: 1906499
URL: http://svn.apache.org/viewvc?rev=1906499&view=rev
Log:
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
Added:
httpd/httpd/branches/2.4.x/changes-entries/hc_timeouts.txt
- copied unchanged from r1889936, httpd/httpd/trunk/changes-entries/hc_timeouts.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1889936
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1906499&r1=1906498&r2=1906499&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jan 9 13:28:33 2023
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c?rev=1906499&r1=1906498&r2=1906499&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c Mon Jan 9 13:28:33 2023
@@ -512,10 +512,12 @@ static proxy_worker *hc_get_hcworker(sct
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 */