From: Olivier Houchard <ohouchard@haproxy.com>
Date: Tue, 11 Jun 2019 14:36:33 +0000 (+0200)
Subject: BUG/MEDIUM: h1: Don't try to subscribe if we had a connection error.
X-Git-Tag: v2.0-dev7~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92d093d641a709ddd1e89f646a3c653ab56b05cf;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: h1: Don't try to subscribe if we had a connection error.

If the CO_FL_ERROR flag is set, and we weren't connected yet, don't attempt
to subscribe, as the underlying xprt may already have been destroyed.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index c9c8f84caf..ae9e8fd6fe 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1794,7 +1794,7 @@ static int h1_recv(struct h1c *h1c)
 	if (h1c->wait_event.events & SUB_RETRY_RECV)
 		return (b_data(&h1c->ibuf));
 
-	if (h1c->flags & H1C_F_CS_WAIT_CONN) {
+	if (!(conn->flags & CO_FL_ERROR) && h1c->flags & H1C_F_CS_WAIT_CONN) {
 		conn->xprt->subscribe(conn, conn->xprt_ctx, SUB_RETRY_RECV, &h1c->wait_event);
 		return 0;
 	}