From: Willy Tarreau <w@1wt.eu>
Date: Fri, 18 Sep 2020 05:41:28 +0000 (+0200)
Subject: BUG/MINOR: h2/trace: do not display "stream error" after a frame ACK
X-Git-Tag: v2.1.9~15
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=b283a7edd3d5f49ae171aa442381af1dd8d992ea;p=haproxy-2.1.git

BUG/MINOR: h2/trace: do not display "stream error" after a frame ACK

When sending a frame ACK, the parser state is not equal to H2_CS_FRAME_H
and we used to report it as an error, which is not true. In fact we should
only indicate when we skip remaining data.

This may be backported as far as 2.1.

(cherry picked from commit bba7a4dafdabf6e4b669e905778ab1904eb4784d)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit e6fb02032ed3166abfdd99b172adbb6868b0887d)
Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 33775dc..ee2b309 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -3209,7 +3209,8 @@ static void h2_process_demux(struct h2c *h2c)
 		}
 
 		if (h2c->st0 != H2_CS_FRAME_H) {
-			TRACE_DEVEL("stream error, skip frame payload", H2_EV_RX_FRAME, h2c->conn, h2s);
+			if (h2c->dfl)
+				TRACE_DEVEL("skipping remaining frame payload", H2_EV_RX_FRAME, h2c->conn, h2s);
 			ret = MIN(b_data(&h2c->dbuf), h2c->dfl);
 			b_del(&h2c->dbuf, ret);
 			h2c->dfl -= ret;