From: Willy Tarreau <w@1wt.eu>
Date: Fri, 30 Nov 2018 15:52:32 +0000 (+0100)
Subject: BUG/MINOR: connection: report mux modes when HTX is supported
X-Git-Tag: v1.9-dev9~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3c49d17dc3b9c532cda934a365e31601eab1926;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/include/proto/connection.h b/include/proto/connection.h
index 3f48b154f5..696432280b 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 <default> cannot be specified using 'proto' keyword)\n");
+		"(protocols marked as <default> 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";