mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: rules: Preserve FLT_END analyzers on silent-drop action

Browse Source 
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.7.
This commit is contained in:
Christopher Faulet 2020-03-06 15:10:46 +01:00
parent 5e896510a8
commit 177f480f2c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/proto_tcp.c
View File

@ -1264,9 +1264,8 @@ static enum act_return tcp_exec_action_silent_drop(struct act_rule *rule, struct
if (strm) { if (strm) {
channel_abort(&strm->req); channel_abort(&strm->req);
channel_abort(&strm->res); channel_abort(&strm->res);
strm->req.analysers = 0; strm->req.analysers &= AN_REQ_FLT_END;
strm->res.analysers = 0; strm->res.analysers &= AN_RES_FLT_END;
_HA_ATOMIC_ADD(&strm->be->be_counters.denied_req, 1);
if (!(strm->flags & SF_ERR_MASK)) if (!(strm->flags & SF_ERR_MASK))
strm->flags |= SF_ERR_PRXCOND; strm->flags |= SF_ERR_PRXCOND;
if (!(strm->flags & SF_FINST_MASK)) if (!(strm->flags & SF_FINST_MASK))