]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: mux-pt: Don't perform implicit HTTP upgrade if not supported by mux
authorChristopher Faulet <cfaulet@haproxy.com>
Mon, 8 Mar 2021 14:32:28 +0000 (15:32 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 1 Apr 2021 09:06:47 +0000 (11:06 +0200)
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.

src/proxy.c

index c9a038413569764a91c5498f0064cdf4029d3015..234515ddda0ec346149554d714680ca0e58236c9 100644 (file)
@@ -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;