From: Willy Tarreau <w@1wt.eu>
Date: Thu, 5 Oct 2017 15:53:13 +0000 (+0200)
Subject: MINOR: checks: use conn_full_close() instead of conn_force_close()
X-Git-Tag: v1.8-dev3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402dbc11d57a584a7b69aaababd076a8b462b24b;p=thirdparty%2Fhaproxy.git

MINOR: checks: use conn_full_close() instead of conn_force_close()

There's no point in using conn_force_close() in the checks since they
do not use XPRT_TRACKED so both functions are equivalent.
---

diff --git a/src/checks.c b/src/checks.c
index b61f27ae34..e6cc42a1c3 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1383,7 +1383,7 @@ static int wake_srv_chk(struct connection *conn)
 		 * sure want to abort the hard way.
 		 */
 		conn_sock_drain(conn);
-		conn_force_close(conn);
+		conn_full_close(conn);
 		ret = -1;
 	}
 
@@ -2164,7 +2164,7 @@ static struct task *process_chk_conn(struct task *t)
 			 * server state to be suddenly changed.
 			 */
 			conn_sock_drain(conn);
-			conn_force_close(conn);
+			conn_full_close(conn);
 		}
 
 		if (conn) {
@@ -2640,7 +2640,7 @@ static int tcpcheck_main(struct check *check)
 			 *   3: release and replace the old one on success
 			 */
 			if (check->conn) {
-				conn_force_close(check->conn);
+				conn_full_close(check->conn);
 				retcode = -1; /* do not reuse the fd! */
 			}