From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 8 Mar 2021 14:32:28 +0000 (+0100)
Subject: MINOR: mux-pt: Don't perform implicit HTTP upgrade if not supported by mux
X-Git-Tag: v2.4-dev15~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a9e362b90d5f936c61df68f511c6a9e0f10ab6e;p=thirdparty%2Fhaproxy.git

MINOR: mux-pt: Don't perform implicit HTTP upgrade if not supported by mux

For now this tests is useless, but if the PT muliplexer is flagged to
explicitly not support the upgrades to HTTP, an error is returned.
---

diff --git a/src/proxy.c b/src/proxy.c
index c9a0384135..234515ddda 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -2174,6 +2174,8 @@ int stream_set_backend(struct stream *s, struct proxy *be)
 				if (s->si[0].wait_event.events)
 					conn->mux->unsubscribe(cs, s->si[0].wait_event.events,
 					    &s->si[0].wait_event);
+				if (conn->mux->flags & MX_FL_NO_UPG)
+					return 0;
 				if (conn_upgrade_mux_fe(conn, cs, &s->req.buf, ist(""), PROTO_MODE_HTTP)  == -1)
 					return 0;