From 1a200d6bd5b6523fc7ff7424cc3b369db0495546 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 5 May 2020 07:59:23 +0200 Subject: [PATCH] BUG/MINOR: checks: Support multiple HTTP expect rules For an http-check ruleset, it should be allowed to set a chain of expect rules. But an error is triggered during the post-parsing because of a wrong test, inherited from the evaluation mode before the refactoring. No need to backport. --- src/checks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/checks.c b/src/checks.c index b7d365b..8d371e6 100644 --- a/src/checks.c +++ b/src/checks.c @@ -4497,7 +4497,7 @@ static int tcpcheck_add_http_rule(struct tcpcheck_rule *chk, struct tcpcheck_rul chk->index+1); return 0; } - else if (r->action != TCPCHK_ACT_SEND && chk->action == TCPCHK_ACT_EXPECT) { + else if (r->action != TCPCHK_ACT_SEND && r->action != TCPCHK_ACT_EXPECT && chk->action == TCPCHK_ACT_EXPECT) { memprintf(errmsg, "unable to add http-check expect rule at step %d (missing send rule).", chk->index+1); return 0; -- 1.7.10.4