From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 14 May 2019 20:46:41 +0000 (+0200)
Subject: MINOR: stream-int: Don't use the flag CO_RFL_KEEP_RSV anymore in si_cs_recv()
X-Git-Tag: v2.0-dev5~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cdd5036f356c3ce36269689915ad43cb23b2bd9;p=thirdparty%2Fhaproxy.git

MINOR: stream-int: Don't use the flag CO_RFL_KEEP_RSV anymore in si_cs_recv()

Because the channel_recv_max() always return the right value, for HTX and legacy
streams, we don't need to set this flag. The multiplexer don't use it anymore.
---

diff --git a/src/stream_interface.c b/src/stream_interface.c
index b12d50bc38..3a3824c670 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -1281,10 +1281,7 @@ int si_cs_recv(struct conn_stream *cs)
 		 * CS_FL_RCV_MORE on the CS if more space is needed.
 		 */
 		max = channel_recv_max(ic);
-		ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max,
-		          flags |
-		          (co_data(ic) ? CO_RFL_BUF_WET : 0) |
-		          ((channel_recv_limit(ic) < b_size(&ic->buf)) ? CO_RFL_KEEP_RSV : 0));
+		ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max, flags | (co_data(ic) ? CO_RFL_BUF_WET : 0));
 
 		if (cs->flags & CS_FL_WANT_ROOM)
 			si_rx_room_blk(si);