]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: http-rules: Preserve FLT_END analyzers on reject action
authorChristopher Faulet <cfaulet@haproxy.com>
Fri, 6 Mar 2020 13:02:57 +0000 (14:02 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Fri, 6 Mar 2020 13:13:00 +0000 (14:13 +0100)
When at least a filter is attached to a stream, FLT_END analyzers must be
preserved on request and response channels.

This patch should be backported as far as 1.8.

src/http_act.c

index b44130add35bee5747d5d22522ba6492d0ef3219..7b14afd62099fc67439c105d8684122971c06256 100644 (file)
@@ -369,8 +369,8 @@ static enum act_return http_action_reject(struct act_rule *rule, struct proxy *p
        si_must_kill_conn(chn_prod(&s->req));
        channel_abort(&s->req);
        channel_abort(&s->res);
-       s->req.analysers = 0;
-       s->res.analysers = 0;
+       s->req.analysers &= AN_RES_FLT_END;
+       s->res.analysers &= AN_REQ_FLT_END;
 
        _HA_ATOMIC_ADD(&s->be->be_counters.denied_req, 1);
        _HA_ATOMIC_ADD(&sess->fe->fe_counters.denied_req, 1);