From: Willy Tarreau <w@1wt.eu>
Date: Fri, 29 Aug 2008 09:30:14 +0000 (+0200)
Subject: [MINOR] do not check for BF_SHUTR when computing write timeout
X-Git-Tag: v1.3.16-rc1~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21e1be8152c906141d7889220f4da6af1bd7923d;p=thirdparty%2Fhaproxy.git

[MINOR] do not check for BF_SHUTR when computing write timeout

This check was useless as !BF_SHUTR is already implied by tick_isset(rex).
---

diff --git a/src/stream_sock.c b/src/stream_sock.c
index 4ddb121c89..459da71dd9 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -604,7 +604,7 @@ int stream_sock_data_finish(int fd)
 			EV_FD_COND_S(fd, DIR_WR);
 			if (!tick_isset(ob->wex) || ob->flags & BF_WRITE_ACTIVITY) {
 				ob->wex = tick_add_ifset(now_ms, ob->wto);
-				if (tick_isset(ob->wex) && !(ib->flags & BF_SHUTR) && tick_isset(ib->rex)) {
+				if (tick_isset(ob->wex) && tick_isset(ib->rex)) {
 					/* Note: depending on the protocol, we don't know if we're waiting
 					 * for incoming data or not. So in order to prevent the socket from
 					 * expiring read timeouts during writes, we refresh the read timeout,