From: willy tarreau <willy@wtap.(none)>
Date: Tue, 13 Jun 2006 17:28:58 +0000 (+0200)
Subject: [BUG] neither stats nor error messages could be returned without clitimeout
X-Git-Tag: v1.3.0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccf454ac7006d39671e9b883635b034306c55bd4;p=thirdparty%2Fhaproxy.git

[BUG] neither stats nor error messages could be returned without clitimeout
---

diff --git a/haproxy.c b/haproxy.c
index 7b5daf2d44..34cb0bb76d 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -3032,7 +3032,10 @@ void client_retnclose(struct session *s, int len, const char *msg) {
     FD_CLR(s->cli_fd, StaticReadEvent);
     FD_SET(s->cli_fd, StaticWriteEvent);
     tv_eternity(&s->crexpire);
-    tv_delayfrom(&s->cwexpire, &now, s->proxy->clitimeout);
+    if (s->proxy->clitimeout)
+	tv_delayfrom(&s->cwexpire, &now, s->proxy->clitimeout);
+    else
+	tv_eternity(&s->cwexpire);
     shutdown(s->cli_fd, SHUT_RD);
     s->cli_state = CL_STSHUTR;
     buffer_flush(s->rep);