From: Willy Tarreau <w@1wt.eu>
Date: Tue, 24 May 2022 06:03:26 +0000 (+0200)
Subject: CLEANUP: conn_stream: remove unneeded exclusion of RX_WAIT_EP from RXBLK_ANY
X-Git-Tag: v2.6-dev12~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fec7a1f986f4ec600042c76ae8566d59d4ec5bc;p=thirdparty%2Fhaproxy.git

CLEANUP: conn_stream: remove unneeded exclusion of RX_WAIT_EP from RXBLK_ANY

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.
---

diff --git a/src/conn_stream.c b/src/conn_stream.c
index df916cc9b2..772feb9bcd 100644
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -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);