From: Willy Tarreau <w@1wt.eu>
Date: Fri, 11 Dec 2020 12:56:12 +0000 (+0100)
Subject: CLEANUP: connection: remove the unneeded fd_stop_{recv,send} on read0/shutw
X-Git-Tag: v2.4-dev3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a9e56478e358be44fb5258cad4463bed97360fe;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index 7c279afac6..13c93a4b83 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.
 		 */