From 3a9e56478e358be44fb5258cad4463bed97360fe Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 11 Dec 2020 13:56:12 +0100 Subject: [PATCH] CLEANUP: connection: remove the unneeded fd_stop_{recv,send} on read0/shutw These are two other areas where this fd_stop_recv()/fd_stop_send() makes no sense anymore. Both happen by definition while the FD is *not* subscribed, since nowadays it's subscribed after failing recv()/send(), in which case we cannot close. --- include/haproxy/connection.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h index 7c279afac..13c93a4b8 100644 --- a/include/haproxy/connection.h +++ b/include/haproxy/connection.h @@ -177,7 +177,6 @@ static inline void conn_sock_read0(struct connection *c) { c->flags |= CO_FL_SOCK_RD_SH; if (conn_ctrl_ready(c)) { - fd_stop_recv(c->handle.fd); /* we don't risk keeping ports unusable if we found the * zero from the other side. */ @@ -194,7 +193,6 @@ static inline void conn_sock_shutw(struct connection *c, int clean) { c->flags |= CO_FL_SOCK_WR_SH; if (conn_ctrl_ready(c)) { - fd_stop_send(c->handle.fd); /* don't perform a clean shutdown if we're going to reset or * if the shutr was already received. */