From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 7 Jan 2019 13:27:53 +0000 (+0100)
Subject: BUG/MINOR: stats/htx: Respect the reserve when the stats page is dumped
X-Git-Tag: v2.0-dev1~252
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69fc88c605e40d8401dde8e53c7a6f23901f6a70;p=thirdparty%2Fhaproxy.git

BUG/MINOR: stats/htx: Respect the reserve when the stats page is dumped

As for the cache applet, this one must respect the reserve on HTX streams. This
patch is tagged as MINOR because it is unlikely to fully fill the channel's
buffer. Some tests are already done to not process almost full buffer.

This patch must be backported to 1.9.
---

diff --git a/src/stats.c b/src/stats.c
index 5e54dd5b2d..ebd95d3f04 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -243,6 +243,8 @@ static THREAD_LOCAL struct field stats[ST_F_TOTAL_FIELDS];
 static int stats_putchk(struct channel *chn, struct htx *htx, struct buffer *chk)
 {
 	if (htx) {
+		if (chk->data >= channel_htx_recv_max(chn, htx))
+			return 0;
 		if (!htx_add_data(htx, ist2(chk->area, chk->data)))
 			return 0;
 		channel_add_input(chn, chk->data);