mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: stream-int: always clear CS_FL_WANT_ROOM before receiving

Browse Source 
Commit d94f877cd ("BUG/MINOR: mux_pt: Set CS_FL_WANT_ROOM when count is
zero in rcv_buf() callback") triggered a pending issue with this flag,
which is that it's cleared too late and sometimes causes some Rx
transfers to stall. We need to clear it before attempting to receive
otherwise we may risk to see an earlier copy of the flag.

Note that it should probably be defined that this flag could be purged
on each invocation of mux->rcv_buf(), which would make sense.

No backport is needed.
This commit is contained in:
Willy Tarreau 2018-12-18 09:15:43 +01:00
parent 121c4e0bca
commit 7ab99a302d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stream_interface.c
View File

@ -1116,6 +1116,9 @@ int si_cs_recv(struct conn_stream *cs)
return 1; // We want to make sure si_cs_wake() is called, so that process_strema is woken up, on failure
}
/* prepare to detect if the mux needs more room */
cs->flags &= ~CS_FL_WANT_ROOM;
if ((ic->flags & (CF_STREAMER | CF_STREAMER_FAST)) && !co_data(ic) &&
global.tune.idle_timer &&
(unsigned short)(now_ms - ic->last_read) >= global.tune.idle_timer) {