]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: tcp-rules: Set the inspect-delay when a tcp-response action yields
authorChristopher Faulet <cfaulet@haproxy.com>
Wed, 29 Jul 2020 10:00:23 +0000 (12:00 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 30 Jul 2020 07:31:09 +0000 (09:31 +0200)
On a tcp-response content ruleset evaluation, the inspect-delay is engaged when
rule's conditions are not validated but not when the rule's action yields.

This patch must be backported to all supported versions.

src/tcp_rules.c

index 4db7dec28b43527e36f811747d8dd66d67ea6c0d..d80c27ccff0ea55fbb47a9475e2e145d94175695 100644 (file)
@@ -366,7 +366,9 @@ resume_execution:
 
  missing_data:
        channel_dont_close(rep);
-       s->current_rule = rule;
+       /* just set the analyser timeout once at the beginning of the response */
+       if (!tick_isset(rep->analyse_exp) && s->be->tcp_rep.inspect_delay)
+               rep->analyse_exp = tick_add(now_ms, s->be->tcp_rep.inspect_delay);
        DBG_TRACE_DEVEL("waiting for more data", STRM_EV_STRM_ANA|STRM_EV_TCP_ANA, s);
        return 0;