From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 29 Jul 2020 10:00:23 +0000 (+0200)
Subject: BUG/MINOR: tcp-rules: Set the inspect-delay when a tcp-response action yields
X-Git-Tag: v2.3-dev2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54f3e183c87fa3694a25b3116c724222fc95676b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tcp-rules: Set the inspect-delay when a tcp-response action yields

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.
---

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 4db7dec28b..d80c27ccff 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -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;