mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 12:41:00 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: stream-int: don't mark as blocked an empty buffer on Rx

Browse Source 
After 8706c8131 ("BUG/MEDIUM: mux_pt: Always set CS_FL_RCV_MORE."), a
side effect caused failed receives to mark the buffer as missing room,
a flag that no other place can remove since it's empty. Ideally we need
a separate flag to mean "failed to deliver data by lack of room", but
in the mean time at the very least we must not mark as blocked an
empty buffer.

No backport is needed.
This commit is contained in:
Willy Tarreau 2018-12-05 13:45:41 +01:00
parent c5efa33021
commit 674e0addc4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stream_interface.c
View File

@ -1214,7 +1214,8 @@ int si_cs_recv(struct conn_stream *cs)
flags |
(co_data(ic) ? CO_RFL_BUF_WET : 0) |
((channel_recv_limit(ic) < b_size(&ic->buf)) ? CO_RFL_KEEP_RSV : 0));
if (cs->flags & CS_FL_RCV_MORE)
if (b_data(&ic->buf) && (cs->flags & CS_FL_RCV_MORE))
si_rx_room_blk(si);
if (cs->flags & CS_FL_READ_PARTIAL) {