]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: checks: Support multiple HTTP expect rules
authorChristopher Faulet <cfaulet@haproxy.com>
Tue, 5 May 2020 05:59:23 +0000 (07:59 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Tue, 5 May 2020 09:07:00 +0000 (11:07 +0200)
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

index b7d365b5b14fc8268e0e1a50c3e297a0f78b8676..8d371e652d5c48cf42917541dc7c9a8cba146a3b 100644 (file)
@@ -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;