From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 15 Mar 2021 16:54:31 +0000 (+0100)
Subject: BUG/MINOR: mux-h2: Don't emit log twice if an error occurred on the preface
X-Git-Tag: v2.4-dev15~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceab1ed86cbe74701d9c2ed921a2890fb2f90c94;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-h2: Don't emit log twice if an error occurred on the preface

sess_log() was called twice if an error occurred on the preface parsing, in
h2c_frt_recv_preface() and in h2_process_demux().

This patch must be backported as far as 2.0.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 06abbc123c..235eb6d8d4 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1681,9 +1681,6 @@ static int h2c_frt_recv_preface(struct h2c *h2c)
 	ret1 = b_isteq(&h2c->dbuf, 0, b_data(&h2c->dbuf), ist(H2_CONN_PREFACE));
 
 	if (unlikely(ret1 <= 0)) {
-		if (ret1 < 0)
-			sess_log(h2c->conn->owner);
-
 		if (ret1 < 0 || conn_xprt_read0_pending(h2c->conn)) {
 			TRACE_ERROR("I/O error or short read", H2_EV_RX_FRAME|H2_EV_RX_PREFACE, h2c->conn);
 			h2c_error(h2c, H2_ERR_PROTOCOL_ERROR);