RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-28 15:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: conn_stream: remove unneeded exclusion of RX_WAIT_EP from RXBLK_ANY

Browse Source 
This test in cs_update_rx() was introduced in 1.9 by commit b26a6f970
("MEDIUM: stream-int: make use of si_rx_chan_{rdy,blk} to control the
stream-int from the channel"), but by then already it was not needed
because the RX_WAIT_EP flag has never been part of RXBLK_ANY so there's
no point doing "flags & RXBLK_ANY & ~RX_WAIT_EP", that part is already
complicated enough like this.
This commit is contained in:
Willy Tarreau 2022-05-24 08:03:26 +02:00
parent bb186ee318
commit 5fec7a1f98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conn_stream.c
View File

@ -1042,7 +1042,7 @@ void cs_update_rx(struct conn_stream *cs)
*/
cs_rx_room_rdy(cs);
}
if (cs->endp->flags & CS_EP_RXBLK_ANY & ~CS_EP_RX_WAIT_EP)
if (cs->endp->flags & CS_EP_RXBLK_ANY)
ic->rex = TICK_ETERNITY;
else if (!(ic->flags & CF_READ_NOEXP) && !tick_isset(ic->rex))
ic->rex = tick_add_ifset(now_ms, ic->rto);