From 7e346f3694ac8d0cd3f306d2d971eae59af3d4da Mon Sep 17 00:00:00 2001
From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 20 Nov 2018 17:13:52 +0100
Subject: [PATCH] BUG/MINOR: mux-htx: Fix bad test on h1c flags in
 h1_recv_allowed()

A logical OR was used instead of a binary OR. Thanks to David Carlier to spot
and report this bug.
---
 src/mux_h1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 87b584157..2e28d369e 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -128,7 +128,7 @@ static void h1_shutw_conn(struct connection *conn);
 static inline int h1_recv_allowed(const struct h1c *h1c)
 {
 	if (b_data(&h1c->ibuf) == 0 &&
-	    (h1c->flags & (H1C_F_CS_ERROR||H1C_F_CS_SHUTW) ||
+	    (h1c->flags & (H1C_F_CS_ERROR|H1C_F_CS_SHUTW) ||
 	     h1c->conn->flags & CO_FL_ERROR ||
 	     conn_xprt_read0_pending(h1c->conn)))
 		return 0;