mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: muxes: Remove MX_FL_CLEAN_ABRT flag

Browse Source 
This flag is unused. Thus, it may be removed. No reason to still set it. It
also cleans up "haproxy -vv" output.
This commit is contained in:
Christopher Faulet 2022-04-12 18:04:10 +02:00
parent 177a0e60ee
commit a97ccedf6f
5 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
doc/configuration.txt
View File

@ -14102,15 +14102,14 @@ proto <name>
in haproxy -vv. The protocols properties are reported : the mode (TCP/HTTP), in haproxy -vv. The protocols properties are reported : the mode (TCP/HTTP),
the side (FE/BE), the mux name and its flags. the side (FE/BE), the mux name and its flags.
Some protocols report errors on aborts (flag=CLEAN_ABRT). Some others are Some protocols are subject to the head-of-line blocking on server side
subject to the head-of-line blocking on server side (flag=HOL_RISK). Finally (flag=HOL_RISK). Finally some protocols don't support upgrades (flag=NO_UPG).
some protocols don't support upgrades (flag=NO_UPG). The HTX compatibility is The HTX compatibility is also reported (flag=HTX).
also reported (flag=HTX).
Here are the protocols that may be used as argument to a "proto" directive on Here are the protocols that may be used as argument to a "proto" directive on
a bind line : a bind line :
h2 : mode=HTTP side=FE|BE mux=H2 flags=HTX|CLEAN_ABRT|HOL_RISK|NO_UPG h2 : mode=HTTP side=FE|BE mux=H2 flags=HTX|HOL_RISK|NO_UPG
h1 : mode=HTTP side=FE|BE mux=H1 flags=HTX|NO_UPG h1 : mode=HTTP side=FE|BE mux=H1 flags=HTX|NO_UPG
none : mode=TCP side=FE|BE mux=PASS flags=NO_UPG none : mode=TCP side=FE|BE mux=PASS flags=NO_UPG
@ -14526,15 +14525,14 @@ check-proto <name>
protocols is reported in haproxy -vv. The protocols properties are protocols is reported in haproxy -vv. The protocols properties are
reported : the mode (TCP/HTTP), the side (FE/BE), the mux name and its flags. reported : the mode (TCP/HTTP), the side (FE/BE), the mux name and its flags.
Some protocols report errors on aborts (flag=CLEAN_ABRT). Some others are Some protocols are subject to the head-of-line blocking on server side
subject to the head-of-line blocking on server side (flag=HOL_RISK). Finally (flag=HOL_RISK). Finally some protocols don't support upgrades (flag=NO_UPG).
some protocols don't support upgrades (flag=NO_UPG). The HTX compatibility is The HTX compatibility is also reported (flag=HTX).
also reported (flag=HTX).
Here are the protocols that may be used as argument to a "check-proto" Here are the protocols that may be used as argument to a "check-proto"
directive on a server line: directive on a server line:
h2 : mode=HTTP side=FE|BE mux=H2 flags=HTX|CLEAN_ABRT|HOL_RISK|NO_UPG h2 : mode=HTTP side=FE|BE mux=H2 flags=HTX|HOL_RISK|NO_UPG
fcgi : mode=HTTP side=BE mux=FCGI flags=HTX|HOL_RISK|NO_UPG fcgi : mode=HTTP side=BE mux=FCGI flags=HTX|HOL_RISK|NO_UPG
h1 : mode=HTTP side=FE|BE mux=H1 flags=HTX|NO_UPG h1 : mode=HTTP side=FE|BE mux=H1 flags=HTX|NO_UPG
none : mode=TCP side=FE|BE mux=PASS flags=NO_UPG none : mode=TCP side=FE|BE mux=PASS flags=NO_UPG
@ -15038,15 +15036,14 @@ proto <name>
reported in haproxy -vv.The protocols properties are reported : the mode reported in haproxy -vv.The protocols properties are reported : the mode
(TCP/HTTP), the side (FE/BE), the mux name and its flags. (TCP/HTTP), the side (FE/BE), the mux name and its flags.
Some protocols report errors on aborts (flag=CLEAN_ABRT). Some others are Some protocols are subject to the head-of-line blocking on server side
subject to the head-of-line blocking on server side (flag=HOL_RISK). Finally (flag=HOL_RISK). Finally some protocols don't support upgrades (flag=NO_UPG).
some protocols don't support upgrades (flag=NO_UPG). The HTX compatibility is The HTX compatibility is also reported (flag=HTX).
also reported (flag=HTX).
Here are the protocols that may be used as argument to a "proto" directive on Here are the protocols that may be used as argument to a "proto" directive on
a server line : a server line :
h2 : mode=HTTP side=FE|BE mux=H2 flags=HTX|CLEAN_ABRT|HOL_RISK|NO_UPG h2 : mode=HTTP side=FE|BE mux=H2 flags=HTX|HOL_RISK|NO_UPG
fcgi : mode=HTTP side=BE mux=FCGI flags=HTX|HOL_RISK|NO_UPG fcgi : mode=HTTP side=BE mux=FCGI flags=HTX|HOL_RISK|NO_UPG
h1 : mode=HTTP side=FE|BE mux=H1 flags=HTX|NO_UPG h1 : mode=HTTP side=FE|BE mux=H1 flags=HTX|NO_UPG
none : mode=TCP side=FE|BE mux=PASS flags=NO_UPG none : mode=TCP side=FE|BE mux=PASS flags=NO_UPG

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

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

3
src/connection.c
View File

@ -1716,9 +1716,6 @@ void list_mux_proto(FILE *out)
if (item->mux->flags & MX_FL_HTX) if (item->mux->flags & MX_FL_HTX)
done |= fprintf(out, "%sHTX", done ? "|" : ""); done |= fprintf(out, "%sHTX", done ? "|" : "");
if (item->mux->flags & MX_FL_CLEAN_ABRT)
done |= fprintf(out, "%sCLEAN_ABRT", done ? "|" : "");
if (item->mux->flags & MX_FL_HOL_RISK) if (item->mux->flags & MX_FL_HOL_RISK)
done |= fprintf(out, "%sHOL_RISK", done ? "|" : ""); done |= fprintf(out, "%sHOL_RISK", done ? "|" : "");

2
src/mux_h2.c
View File

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

2
src/mux_quic.c
View File

@ -1361,7 +1361,7 @@ static const struct mux_ops qc_ops = {
.subscribe = qc_subscribe, .subscribe = qc_subscribe,
.unsubscribe = qc_unsubscribe, .unsubscribe = qc_unsubscribe,
.wake = qc_wake, .wake = qc_wake,
.flags = MX_FL_CLEAN_ABRT|MX_FL_HTX|MX_FL_NO_UPG, .flags = MX_FL_HTX|MX_FL_NO_UPG,
.name = "QUIC", .name = "QUIC",
}; };