MINOR: connection: Remove the multiplexer protocol PROTO_MODE_HTX
Since the legacy HTTP mode is disabled and no multiplexer relies on it anymore,
there is no reason to have 2 multiplexer protocols for the HTTP. So the protocol
PROTO_MODE_HTX was removed and all HTTP multiplexers use now PROTO_MODE_HTTP.
diff --git a/include/proto/connection.h b/include/proto/connection.h
index 02f3234..9b4ac51 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -929,10 +929,6 @@
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";
@@ -1043,7 +1039,7 @@
int mode;
if (bind_conf->frontend->mode == PR_MODE_HTTP)
- mode = ((bind_conf->frontend->options2 & PR_O2_USE_HTX) ? PROTO_MODE_HTX : PROTO_MODE_HTTP);
+ mode = PROTO_MODE_HTTP;
else
mode = PROTO_MODE_TCP;
@@ -1081,7 +1077,7 @@
int mode;
if (prx->mode == PR_MODE_HTTP)
- mode = ((prx->options2 & PR_O2_USE_HTX) ? PROTO_MODE_HTX : PROTO_MODE_HTTP);
+ mode = PROTO_MODE_HTTP;
else
mode = PROTO_MODE_TCP;
diff --git a/include/types/connection.h b/include/types/connection.h
index cc2fb17..6609f8b 100644
--- a/include/types/connection.h
+++ b/include/types/connection.h
@@ -471,8 +471,7 @@
PROTO_MODE_NONE = 0,
PROTO_MODE_TCP = 1 << 0, // must not be changed!
PROTO_MODE_HTTP = 1 << 1, // must not be changed!
- PROTO_MODE_HTX = 1 << 2, // must not be changed!
- PROTO_MODE_ANY = PROTO_MODE_TCP | PROTO_MODE_HTTP, // note: HTX is experimental and must not appear here
+ PROTO_MODE_ANY = PROTO_MODE_TCP | PROTO_MODE_HTTP,
};
enum proto_proxy_side {