commit ccf454ac7006d39671e9b883635b034306c55bd4
author willy tarreau <willy@wtap.(none)> Tue Jun 13 19:28:58 2006 +0200
committer willy tarreau <willy@wtap.(none)> Thu Jun 15 21:00:47 2006 +0200
tree 895a2a508bda42de40d6b9c616c17aca93642e8f
parent 94b4591f203fa2a1504f9a6923761a3e742080e8

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

haproxy.c

diff --git a/haproxy.c b/haproxy.c
index 7b5daf2..34cb0bb 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -3032,7 +3032,10 @@
     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);