From: Willy TARREAU <willy@pcw.(none)>
Date: Wed, 1 Mar 2006 21:33:49 +0000 (+0100)
Subject: * a never ending connect() could lead to a fast select() loop if
X-Git-Tag: v1.2.9~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cec83c754012a72200330b21ffcb9261fd59158;p=thirdparty%2Fhaproxy.git

* a never ending connect() could lead to a fast select() loop if
  its timeout times the number of retransmits exceeded the server
  read or write timeout, because the later was used to compute
  select()'s timeout while the connection timeout was not reached.
---

diff --git a/haproxy.c b/haproxy.c
index 0da06a9f45..5cf60af981 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -2345,13 +2345,18 @@ int event_srv_write(int fd) {
 	fdtab[fd].state = FD_STERROR;
     }
 
-    if (s->proxy->srvtimeout) {
-	tv_delayfrom(&s->swexpire, &now, s->proxy->srvtimeout);
-	/* FIXME: to avoid the server to read-time-out during writes, we refresh it */
-	s->srexpire = s->swexpire;
+    /* We don't want to re-arm read/write timeouts if we're trying to connect,
+     * otherwise it could loop indefinitely !
+     */
+    if (s->srv_state != SV_STCONN) {
+	if (s->proxy->srvtimeout) {
+	    tv_delayfrom(&s->swexpire, &now, s->proxy->srvtimeout);
+	    /* FIXME: to avoid the server to read-time-out during writes, we refresh it */
+	    s->srexpire = s->swexpire;
+	}
+	else
+	    tv_eternity(&s->swexpire);
     }
-    else
-	tv_eternity(&s->swexpire);
 
     task_wakeup(&rq, t);
     return 0;
@@ -4946,6 +4951,14 @@ int process_session(struct task *t) {
 	/* restore t to its place in the task list */
 	task_queue(t);
 
+#ifdef DEBUG_FULL
+	/* DEBUG code : this should never ever happen, otherwise it indicates
+	 * that a task still has something to do and will provoke a quick loop.
+	 */
+	if (tv_remain2(&now, &t->expire) <= 0)
+	    exit(100);
+#endif
+
 	return tv_remain2(&now, &t->expire); /* nothing more to do */
     }