From: Olivier Houchard Date: Wed, 8 May 2019 17:48:32 +0000 (+0200) Subject: BUG/MEDIUM: servers: Don't use the same srv flag for cookie-set and TFO. X-Git-Tag: v2.0-dev3~72 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92e38e254b2cef4e5cde4fbce91207a88f0a4610;p=thirdparty%2Fhaproxy.git BUG/MEDIUM: servers: Don't use the same srv flag for cookie-set and TFO. The tfo code was based on an old patch, and the value of the SRV_F_FASTOPEN flag it used was since reused for SRV_F_COOKIESET. So give SRV_F_FASTOPEN its own value. --- diff --git a/include/types/server.h b/include/types/server.h index 1a7109a2fd..24e4d89915 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -143,7 +143,7 @@ enum srv_initaddr { #define SRV_F_CHECKPORT 0x0040 /* this server has a check port configured */ #define SRV_F_AGENTADDR 0x0080 /* this server has a agent addr configured */ #define SRV_F_COOKIESET 0x0100 /* this server has a cookie configured, so don't generate dynamic cookies */ -#define SRV_F_FASTOPEN 0x0100 /* Use TCP Fast Open to connect to server */ +#define SRV_F_FASTOPEN 0x0200 /* Use TCP Fast Open to connect to server */ /* configured server options for send-proxy (server->pp_opts) */ #define SRV_PP_V1 0x0001 /* proxy protocol version 1 */