From: Willy Tarreau <w@1wt.eu>
Date: Mon, 8 Dec 2014 10:26:08 +0000 (+0100)
Subject: BUG/MINOR: tcp-check: don't condition data polling on check type
X-Git-Tag: v1.6-dev1~251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7b9ed33ee7306c1f9fd276bb5e683befab06e82;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tcp-check: don't condition data polling on check type

tcp_check_main() would condition the polling for writes on check->type,
but this is absurd given that check->type == PR_O2_TCPCHK_CHK since this
is the only way we can get there! This patch removes this confusing test.
---

diff --git a/src/checks.c b/src/checks.c
index 03ddb26c44..f6fb23d5f5 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -2496,7 +2496,7 @@ static void tcpcheck_main(struct connection *conn)
 
 			ret = SN_ERR_INTERNAL;
 			if (proto->connect)
-				ret = proto->connect(conn, check->type, (check->type) ? 0 : 2);
+				ret = proto->connect(conn, 1, 0);
 			conn->flags |= CO_FL_WAKE_DATA;
 			if (check->current_step->conn_opts & TCPCHK_OPT_SEND_PROXY) {
 				conn->send_proxy_ofs = 1;