RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: muxes: Add a flag to notify a mux does not support any upgrade

Browse Source 
MX_FL_NO_UPG flag may now be set on a multiplexer to explicitly disable
upgrades from this mux. For now, it is set on the FCGI multiplexer because
it is not supported and there is no upgrade on backend-only multiplexers. It
is also set on the H2 multiplexer because it is clearly not supported.
This commit is contained in:
Christopher Faulet 2021-03-08 15:28:28 +01:00
parent bb7abede93
commit a460057f2e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/connection-t.h
View File

@ -296,6 +296,7 @@ enum {
MX_FL_CLEAN_ABRT = 0x00000001, /* abort is clearly reported as an error */
MX_FL_HTX = 0x00000002, /* set if it is an HTX multiplexer */
MX_FL_HOL_RISK = 0x00000004, /* set if the protocol is subject the to head-of-line blocking on server */
MX_FL_NO_UPG = 0x00000008, /* set if mux does not support any upgrade */
};
/* PROTO token registration */

2
src/mux_fcgi.c
View File

@ -4240,7 +4240,7 @@ static const struct mux_ops mux_fcgi_ops = {
.ctl = fcgi_ctl,
.show_fd = fcgi_show_fd,
.takeover = fcgi_takeover,
.flags = MX_FL_HTX|MX_FL_HOL_RISK,
.flags = MX_FL_HTX|MX_FL_HOL_RISK|MX_FL_NO_UPG,
.name = "FCGI",
};

2
src/mux_h2.c
View File

@ -6677,7 +6677,7 @@ static const struct mux_ops h2_ops = {
.ctl = h2_ctl,
.show_fd = h2_show_fd,
.takeover = h2_takeover,
.flags = MX_FL_CLEAN_ABRT|MX_FL_HTX|MX_FL_HOL_RISK,
.flags = MX_FL_CLEAN_ABRT|MX_FL_HTX|MX_FL_HOL_RISK|MX_FL_NO_UPG,
.name = "H2",
};