From d3c49d17dc3b9c532cda934a365e31601eab1926 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 30 Nov 2018 16:52:32 +0100 Subject: [PATCH] BUG/MINOR: connection: report mux modes when HTX is supported It looks like we forgot to report HTX when listing the muxes and their respective protocols, leading to "NONE" being displayed. Let's report "HTX" and "HTTP|HTX" since both will exist. Also fix a minor typo in the output message. --- include/proto/connection.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/proto/connection.h b/include/proto/connection.h index 3f48b154f..696432280 100644 --- a/include/proto/connection.h +++ b/include/proto/connection.h @@ -899,7 +899,7 @@ static inline void list_mux_proto(FILE *out) char *mode, *side; fprintf(out, "Available multiplexer protocols :\n" - "(protocols markes as cannot be specified using 'proto' keyword)\n"); + "(protocols marked as cannot be specified using 'proto' keyword)\n"); list_for_each_entry(item, &mux_proto_list.list, list) { proto = item->token; @@ -909,6 +909,10 @@ static inline void list_mux_proto(FILE *out) mode = "TCP"; else if (item->mode == PROTO_MODE_HTTP) mode = "HTTP"; + else if (item->mode == PROTO_MODE_HTX) + mode = "HTX"; + else if (item->mode == (PROTO_MODE_HTTP | PROTO_MODE_HTX)) + mode = "HTTP|HTX"; else mode = "NONE";