From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 30 Aug 2022 08:31:15 +0000 (+0200)
Subject: BUG/MINOR: tcpcheck: Disable QUICKACK for default tcp-check (with no rule)
X-Git-Tag: v2.7-dev5~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f611248d8cc00054c63e831e0dce9c8ad822a133;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tcpcheck: Disable QUICKACK for default tcp-check (with no rule)

The commit 871dd8211 ("BUG/MINOR: tcpcheck: Disable QUICKACK only if data
should be sent after connect") introduced a regression. It removes the test
on the next rule to be able to disable TCP_QUICKACK when only a connect is
performed (so no next rule).

This patch must be backported as far as 2.2.
---

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index 7e7627a2c8..e597cf825f 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -1187,8 +1187,10 @@ enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct tcpchec
 	if (proto && proto->connect) {
 		int flags = 0;
 
+		if (!next)
+			flags |= CONNECT_DELACK_ALWAYS;
 		if (connect->options & TCPCHK_OPT_HAS_DATA)
-			flags = (CONNECT_HAS_DATA|CONNECT_DELACK_ALWAYS);
+			flags |= (CONNECT_HAS_DATA|CONNECT_DELACK_ALWAYS);
 		status = proto->connect(conn, flags);
 	}