]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: stream-int: Don't use the flag CO_RFL_KEEP_RSV anymore in si_cs_recv()
authorChristopher Faulet <cfaulet@haproxy.com>
Tue, 14 May 2019 20:46:41 +0000 (22:46 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 28 May 2019 05:42:12 +0000 (07:42 +0200)
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.

src/stream_interface.c

index b12d50bc3842933a8002876e9f4cd68c9ac0a1dc..3a3824c670a3d7a7910ebe7ce04bbbbc9aa7a8c3 100644 (file)
@@ -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);