From bba7a4dafdabf6e4b669e905778ab1904eb4784d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 18 Sep 2020 07:41:28 +0200 Subject: [PATCH] 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. --- src/mux_h2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mux_h2.c b/src/mux_h2.c index 1a9f15ca2d..d145b8a970 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -3190,7 +3190,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; -- 2.47.3