RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-25 06:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] do not apply timeout.connect in checks if unset

Browse Source 
tv_bound() does not consider infinite timeouts, so we must
check that timeout.connect is set before applying it to the
checks.
This commit is contained in:
Willy Tarreau 2008-02-17 11:34:10 +01:00
parent 6d0b1fac23
commit 6054819a70
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/checks.c
View File

@ -496,11 +496,12 @@ void process_chk(struct task *t, struct timeval *next)
* to establish but only when timeout.check is set
* as it may be to short for a full check otherwise
*/
tv_add(&tv_con, &now, &s->proxy->timeout.connect);
tv_ms_add(&t->expire, &now, s->inter);
if (tv_isset(&s->proxy->timeout.check))
if (tv_isset(&s->proxy->timeout.check) && tv_isset(&s->proxy->timeout.connect)) {
tv_add(&tv_con, &now, &s->proxy->timeout.connect);
tv_bound(&t->expire, &tv_con);
}
task_queue(t); /* restore t to its place in the task list */
*next = t->expire;