BUG/MINOR: tcp-rules: Don't shortened the inspect-delay when EOI is set
A regression was introduced with the commit cb59e0bc3 ("BUG/MINOR:
tcp-rules: Stop content rules eval on read error and end-of-input"). We
should not shorten the inspect-delay when the EOI flag is set on the SC.
Idea of the inspect-delay is to wait a TCP rule is matching. It is only
interrupted if an error occurs, on abort or if the peer shuts down. It is
also interrupted if the buffer is full. This last case is a bit ambiguous
and discutable. It could be good to add ACLS, like "wait_complete" and
"wait_full" to do so. But for now, we only remove the test on SC_FL_EOI
flag.
This patch must be backported to all stable versions.
(cherry picked from commit 2d5a5665fe6c03f1fae1af22d21138347d9acab1)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit cfcdeb0417d55a448f4eafe0d4e4801efab46538)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 6356a4a7aceea9e3f5bc52b714ad5bd8e1688a0a)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 42e4ff3..cf8324c 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -112,7 +112,7 @@
* - if one rule returns KO, then return KO
*/
- if ((req->flags & (CF_EOI|CF_SHUTR|CF_READ_ERROR)) || channel_full(req, global.tune.maxrewrite) ||
+ if ((req->flags & (CF_SHUTR|CF_READ_ERROR)) || channel_full(req, global.tune.maxrewrite) ||
si_rx_blocked_room(chn_prod(req)) ||
!s->be->tcp_req.inspect_delay || tick_is_expired(s->rules_exp, now_ms)) {
partial = SMP_OPT_FINAL;
@@ -268,7 +268,7 @@
* - if one rule returns OK, then return OK
* - if one rule returns KO, then return KO
*/
- if ((rep->flags & (CF_EOI|CF_SHUTR|CF_READ_ERROR)) || channel_full(rep, global.tune.maxrewrite) ||
+ if ((rep->flags & (CF_SHUTR|CF_READ_ERROR)) || channel_full(rep, global.tune.maxrewrite) ||
si_rx_blocked_room(chn_prod(rep)) ||
!s->be->tcp_rep.inspect_delay || tick_is_expired(s->rules_exp, now_ms)) {
partial = SMP_OPT_FINAL;