]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: conn_stream: remove unneeded exclusion of RX_WAIT_EP from RXBLK_ANY
authorWilly Tarreau <w@1wt.eu>
Tue, 24 May 2022 06:03:26 +0000 (08:03 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 27 May 2022 17:33:34 +0000 (19:33 +0200)
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.

src/conn_stream.c

index df916cc9b20d4e9202d1de26405ce686b4faf427..772feb9bcd9e2e6d5c3ab69cb3ecc26cc7f1657b 100644 (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);