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

MEDIUM: stream-int: make si_chk_rcv() check that SI_FL_WAIT_ROOM is cleared

Browse Source 
After careful inspection, it now seems OK to call si_chk_rcv() only when
SI_FL_WAIT_ROOM is cleared and SI_FL_WANT_PUT is set, since all identified
call places have already taken care of this.
This commit is contained in:
Willy Tarreau 2018-11-09 16:21:43 +01:00
parent abf531caa0
commit 8fe516f08a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/proto/stream_interface.h
View File

@ -384,12 +384,13 @@ static inline void si_update(struct stream_interface *si)
} }
/* This is to be used after making some room available in a channel. It will /* This is to be used after making some room available in a channel. It will
* clear SI_FL_WAIT_ROOM, then if SI_FL_WANT_PUT is set, will calls ->chk_rcv() * return without doing anything if {SI_FL_WANT_PUT,SI_FL_WAIT_ROOM} != {1,0}.
* to enable receipt of new data. * It will then call ->chk_rcv() to enable receipt of new data.
*/ */
static inline void si_chk_rcv(struct stream_interface *si) static inline void si_chk_rcv(struct stream_interface *si)
{ {
si->flags &= ~SI_FL_WAIT_ROOM; if (si->flags & SI_FL_WAIT_ROOM)
return;
if (!(si->flags & SI_FL_WANT_PUT)) if (!(si->flags & SI_FL_WANT_PUT))
return; return;