From: Willy Tarreau <w@1wt.eu>
Date: Thu, 23 Apr 2020 15:24:59 +0000 (+0200)
Subject: BUG/MINOR: mux-fcgi/trace: fix wrong set of trace flags in fcgi_strm_add_eom()
X-Git-Tag: v2.2-dev7~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf5b49189561c74c26ee58ec79e2b859b1c4f1c1;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-fcgi/trace: fix wrong set of trace flags in fcgi_strm_add_eom()

A typo resulted in '||' being used to concatenate trace flags, which will
only set flag of value '1' there. Noticed by clang 10 and reported in
issue #588.

No backport is needed, this trace was added in 2.2-dev.
---

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index b0920385fa..2f712f3aca 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -3288,7 +3288,7 @@ static size_t fcgi_strm_add_eom(struct fcgi_strm *fstrm, struct h1m *h1m, struct
 {
 	int ret;
 
-	TRACE_ENTER(FCGI_EV_RSP_DATA||FCGI_EV_RSP_EOM, fstrm->fconn->conn, fstrm,, (size_t[]){max});
+	TRACE_ENTER(FCGI_EV_RSP_DATA|FCGI_EV_RSP_EOM, fstrm->fconn->conn, fstrm,, (size_t[]){max});
 	ret = h1_parse_msg_eom(h1m, htx, max);
 	if (!ret) {
 		TRACE_DEVEL("leaving on missing data or error", FCGI_EV_RSP_DATA|FCGI_EV_RSP_EOM, fstrm->fconn->conn, fstrm);