]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: backend: Try to find the best mux for outgoing connections
authorChristopher Faulet <cfaulet@haproxy.com>
Wed, 28 Feb 2018 09:40:42 +0000 (10:40 +0100)
committerWilly Tarreau <w@1wt.eu>
Wed, 8 Aug 2018 07:54:22 +0000 (09:54 +0200)
For now, there is no effect. mux-pt will always be used because this is only
available mux for backend connections.

src/backend.c

index f7e5dbddfdebcdf03571b5e8c8bd241e3f804839..a52eaccc2490e3efc8dd7594d0b94545b7268620 100644 (file)
@@ -1189,8 +1189,7 @@ int connect_server(struct stream *s)
                else
                        return SF_ERR_INTERNAL;  /* how did we get there ? */
 
-               /* XXX: Pick the right mux, when we finally have one */
-               conn_install_mux(srv_conn, &mux_pt_ops, srv_cs);
+               conn_install_best_mux(srv_conn, s->be->mode == PR_MODE_HTTP, srv_cs);
 
                /* process the case where the server requires the PROXY protocol to be sent */
                srv_conn->send_proxy_ofs = 0;