RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 07:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: stream-int: don't set SI_FL_WAIT_ROOM on CF_READ_DONTWAIT

Browse Source 
With the previous connection model, when we purposely decided to stop
receiving in order to avoid polling after a complete request was received
for example, it was needed to set SI_FL_WAIT_ROOM to prevent receive
polling from being re-armed. Now with the new subscription-based model
there is no such thing anymore and there is noone to remove this flag
either. Thus if a request takes more than one packet to come in or
spans over too many packets, this flag will cause it to wait forever.
Let's simply remove this flag now.

This patch should not be backported since older versions still need
that this flag is set here to stop receiving.
This commit is contained in:
Christopher Faulet 2018-10-22 21:34:21 +02:00 committed by Willy Tarreau
parent 55d6be7d83
commit 955188d37d
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/stream_interface.c
View File

@ -1207,15 +1207,8 @@ int si_cs_recv(struct conn_stream *cs)
break;
}
if ((ic->flags & CF_READ_DONTWAIT) || --read_poll <= 0) {
/*
* This used to be __conn_xprt_done_recv()
* This was changed to accomodate with the mux code,
* but we may have lost a worthwhile optimization.
*/
si->flags |= SI_FL_WAIT_ROOM;
if ((ic->flags & CF_READ_DONTWAIT) || --read_poll <= 0)
break;
}
/* if too many bytes were missing from last read, it means that
* it's pointless trying to read again because the system does