]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: ssl_sock: remove unneeded check on QMux flags
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 21 May 2026 12:40:15 +0000 (14:40 +0200)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 21 May 2026 13:09:10 +0000 (15:09 +0200)
A recent patch has introduced <init_xprt> mux_proto_list member. This
allows to activate QMux on SSL handshake completion without explicit
"proto qmux" setting.

Thanks to this change, on SSL handshake completion it is not necessary
anymore to check for CO_FL_QMUX_* flags.

src/ssl_sock.c

index dd1b9f6045a347d3925da67a6835eb6bc76e0182..3ab33c9900d753edc3e71ebdfbe6029fda61659b 100644 (file)
@@ -6973,8 +6973,7 @@ struct task *ssl_sock_io_cb(struct task *t, void *context, unsigned int state)
                                mux = !conn_is_back(conn) ?
                                  conn_select_mux_fe(conn) : conn_select_mux_be(conn);
 
-                               if (ctx->conn->flags & (CO_FL_QMUX_RECV|CO_FL_QMUX_SEND) ||
-                                   mux->init_xprt == XPRT_QMUX) {
+                               if (mux->init_xprt == XPRT_QMUX) {
                                        const struct xprt_ops *ops = xprt_get(XPRT_QMUX);
                                        void *xprt_ctx_hs = NULL;