From: Willy Tarreau <w@1wt.eu>
Date: Thu, 23 Jan 2020 17:08:45 +0000 (+0100)
Subject: MINOR: connection: don't check for CO_FL_SOCK_WR_SH too early in handshakes
X-Git-Tag: v2.2-dev2~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49139cb9149c36ab7e5e13c2e3048d6590e3bca3;p=thirdparty%2Fhaproxy.git

MINOR: connection: don't check for CO_FL_SOCK_WR_SH too early in handshakes

Just like with CO_FL_SOCK_RD_SH, we don't need to check for this flag too
early because conn_sock_send() already does it. No error was lost so it
was harmless, it was only useless code.
---

diff --git a/src/connection.c b/src/connection.c
index 83790a9d9a..ced919f0e0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1003,10 +1003,6 @@ int conn_send_socks4_proxy_request(struct connection *conn)
 {
 	struct socks4_request req_line;
 
-	/* we might have been called just after an asynchronous shutw */
-	if (conn->flags & CO_FL_SOCK_WR_SH)
-		goto out_error;
-
 	if (!conn_ctrl_ready(conn))
 		goto out_error;
 
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 0a2e7d1d0c..14e6627112 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -329,10 +329,6 @@ struct appctx *si_register_handler(struct stream_interface *si, struct applet *a
  */
 int conn_si_send_proxy(struct connection *conn, unsigned int flag)
 {
-	/* we might have been called just after an asynchronous shutw */
-	if (conn->flags & CO_FL_SOCK_WR_SH)
-		goto out_error;
-
 	if (!conn_ctrl_ready(conn))
 		goto out_error;