From: Willy Tarreau <w@1wt.eu>
Date: Sun, 17 Feb 2008 10:34:10 +0000 (+0100)
Subject: [BUG] do not apply timeout.connect in checks if unset
X-Git-Tag: v1.3.15~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6054819a70a442f6cc5ff563d432512096017da6;p=thirdparty%2Fhaproxy.git

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

tv_bound() does not consider infinite timeouts, so we must
check that timeout.connect is set before applying it to the
checks.
---

diff --git a/src/checks.c b/src/checks.c
index 0fbe166789..1a5bf71608 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -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;