BUG/MINOR: tcpcheck connect wrong behavior

A typo made first step of a tcpcheck to be a connect step. This patch
prevents this behavior. The bug was introduced in 1.5-dev22 with
"tcp-check connect" and only affects these directives. No backport is
needed.
This commit is contained in:
Baptiste Assmann 2014-02-03 22:38:15 +01:00 committed by Willy Tarreau
parent 65ad6e12c1
commit f621bea74a

View File

@ -1578,8 +1578,12 @@ static struct task *process_chk(struct task *t)
}
if (check->type == PR_O2_TCPCHK_CHK) {
tcpcheck_main(conn);
return t;
struct tcpcheck_rule *r = (struct tcpcheck_rule *) s->proxy->tcpcheck_rules.n;
/* if first step is a 'connect', then tcpcheck_main must run it */
if (r->action == TCPCHK_ACT_CONNECT) {
tcpcheck_main(conn);
return t;
}
}