mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: server: Make 'default-server' support 'tcp-ut' keyword.

Browse Source 
This patch makes 'default-server' directive support 'tcp-ut' keyword.
This commit is contained in:
Frdric Lcaille 2017-03-15 16:36:09 +01:00 committed by Willy Tarreau
parent bcaf1d7397
commit 5c3cd97550
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_tcp.c
View File

@ -1833,7 +1833,7 @@ static struct bind_kw_list bind_kws = { "TCP", { }, {
static struct srv_kw_list srv_kws = { "TCP", { }, { static struct srv_kw_list srv_kws = { "TCP", { }, {
#ifdef TCP_USER_TIMEOUT #ifdef TCP_USER_TIMEOUT
{ "tcp-ut", srv_parse_tcp_ut, 1, 0 }, /* set TCP user timeout on server */ { "tcp-ut", srv_parse_tcp_ut, 1, 1 }, /* set TCP user timeout on server */
#endif #endif
{ NULL, NULL, 0 }, { NULL, NULL, 0 },
}}; }};

5
src/server.c
View File

@ -13,6 +13,7 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <netinet/tcp.h>
#include <import/xxhash.h> #include <import/xxhash.h>
@ -1435,6 +1436,10 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
newsrv->ssl_ctx.ciphers = strdup(curproxy->defsrv.ssl_ctx.ciphers); newsrv->ssl_ctx.ciphers = strdup(curproxy->defsrv.ssl_ctx.ciphers);
#endif #endif
#ifdef TCP_USER_TIMEOUT
newsrv->tcp_ut = curproxy->defsrv.tcp_ut;
#endif
cur_arg = 3; cur_arg = 3;
} else { } else {
newsrv = &curproxy->defsrv; newsrv = &curproxy->defsrv;