From: Willy Tarreau Date: Fri, 11 Dec 2020 12:49:19 +0000 (+0100) Subject: CLEANUP: remove the unused fd_stop_send() in conn_xprt_shutw{,_hard}() X-Git-Tag: v2.4-dev3~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ec094b09dea7fcf540686af7cc598bf58003a3c;p=thirdparty%2Fhaproxy.git CLEANUP: remove the unused fd_stop_send() in conn_xprt_shutw{,_hard}() These functions used to disable polling for writes when shutting down but this is no longer used as it still happens later when closing if the connection was subscribed to FD events. Let's just remove this fake and undesired dependency on the FD layer. --- diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h index 1986d3bd87..7c279afac6 100644 --- a/include/haproxy/connection.h +++ b/include/haproxy/connection.h @@ -205,9 +205,6 @@ static inline void conn_sock_shutw(struct connection *c, int clean) static inline void conn_xprt_shutw(struct connection *c) { - if (conn_ctrl_ready(c)) - fd_stop_send(c->handle.fd); - /* clean data-layer shutdown */ if (c->xprt && c->xprt->shutw) c->xprt->shutw(c, c->xprt_ctx, 1); @@ -215,9 +212,6 @@ static inline void conn_xprt_shutw(struct connection *c) static inline void conn_xprt_shutw_hard(struct connection *c) { - if (conn_ctrl_ready(c)) - fd_stop_send(c->handle.fd); - /* unclean data-layer shutdown */ if (c->xprt && c->xprt->shutw) c->xprt->shutw(c, c->xprt_ctx, 0);