From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Mar 2009 20:49:00 +0000 (+0100)
Subject: [BUG] connect timeout is in the stream interface, not the buffer
X-Git-Tag: v1.3.16~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3780f2db86815fbc802d94cc46e206c907312ff;p=thirdparty%2Fhaproxy.git

[BUG] connect timeout is in the stream interface, not the buffer

The connect timeout was not properly detected due to the fact that
it was not correctly initialized. It must be set as the stream interface
timeout, not the buffer's write timeout.
---

diff --git a/src/backend.c b/src/backend.c
index f511b7799e..6ca5059573 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1840,7 +1840,7 @@ int connect_server(struct session *s)
 			s->be->lbprm.server_take_conn(s->srv);
 	}
 
-	s->req->wex = tick_add_ifset(now_ms, s->be->timeout.connect);
+	s->req->cons->exp = tick_add_ifset(now_ms, s->be->timeout.connect);
 	return SN_ERR_NONE;  /* connection is OK */
 }