From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 17 Nov 2023 10:23:11 +0000 (+0100)
Subject: BUG/MINOR: stconn: Fix streamer detection for HTX streams
X-Git-Tag: v2.9-dev10~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24409a5caa902de68e50636399f86345abeb8f65;p=thirdparty%2Fhaproxy.git

BUG/MINOR: stconn: Fix streamer detection for HTX streams

Since the HTX was introduced, the streamer detection is broken for HTX
streams because the HTX overhead was not counted in the test to set
CF_STREAMER and CF_STREAMER_FAST flags.

The consequence was that the consumer side was no longer able to send more
than tune.ssl.maxrecord at a time in SSL.

To fix the issue, we now count the HTX overhead of HTX streams to be able to
set CF_STREAMER/CF_STREAMER_FAST flags on a channel.

This patch relies on folloing commits:

  * "MINOR: channel: Add functions to get info on buffers and deal with HTX streams"
  * "MINOR: htx: Use a macro for overhead induced by HTX"

The series must be backported as far as 2.2.
---

diff --git a/src/stconn.c b/src/stconn.c
index f8eb4ae03d..e7ed6a7ae1 100644
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -1463,8 +1463,7 @@ static int sc_conn_recv(struct stconn *sc)
 				ic->flags &= ~CF_STREAMER_FAST;
 			}
 		}
-		else if (!(ic->flags & CF_STREAMER_FAST) &&
-			 (cur_read >= ic->buf.size - global.tune.maxrewrite)) {
+		else if (!(ic->flags & CF_STREAMER_FAST) && (cur_read >= channel_data_limit(ic))) {
 			/* we read a full buffer at once */
 			ic->xfer_small = 0;
 			ic->xfer_large++;