]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[MINOR] do not check for BF_SHUTR when computing write timeout
authorWilly Tarreau <w@1wt.eu>
Fri, 29 Aug 2008 09:30:14 +0000 (11:30 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 2 Nov 2008 09:19:07 +0000 (10:19 +0100)
This check was useless as !BF_SHUTR is already implied by tick_isset(rex).

src/stream_sock.c

index 4ddb121c89b6fcee986b8d5d2243e58ae4935b90..459da71dd95a177409a126e2be51c4730b23b0f0 100644 (file)
@@ -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,