From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 26 May 2020 09:14:50 +0000 (+0200)
Subject: BUG/MEDIUM: checks: Refresh the conn-stream and the connection after a connect
X-Git-Tag: v2.2-dev9~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cbdd22df5534959e2b94615815760d3c2ab6230;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: checks: Refresh the conn-stream and the connection after a connect

When a connect rule is evaluated, the conn-stream and the connection must be
refreshed in tcpcheck_main(). Otherwise, in case of synchronous connect, these
variables point on outdated values (NULL for the first connect or released
otherwise).

No backport needed.
---

diff --git a/src/checks.c b/src/checks.c
index c3d117ec62..d377b17a48 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -2721,6 +2721,10 @@ static int tcpcheck_main(struct check *check)
 				retcode = -1; /* do not reuse the fd in the caller! */
 			}
 			eval_ret = tcpcheck_eval_connect(check, rule);
+
+			/* Refresh conn-stream and connection */
+			cs = check->cs;
+			conn = cs_conn(cs);
 			must_read = 1; last_read = 0;
 			break;
 		case TCPCHK_ACT_SEND: