From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Wed, 15 Mar 2017 15:36:09 +0000 (+0100)
Subject: MINOR: server: Make 'default-server' support 'tcp-ut' keyword.
X-Git-Tag: v1.8-dev1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c3cd97550e892b3552111de7adf4550b00bffce;p=thirdparty%2Fhaproxy.git

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

This patch makes 'default-server' directive support 'tcp-ut' keyword.
---

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 4741651b93..b664831baa 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -1833,7 +1833,7 @@ static struct bind_kw_list bind_kws = { "TCP", { }, {
 
 static struct srv_kw_list srv_kws = { "TCP", { }, {
 #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
 	{ NULL, NULL, 0 },
 }};
diff --git a/src/server.c b/src/server.c
index 2bba49ff3b..42a45c65da 100644
--- a/src/server.c
+++ b/src/server.c
@@ -13,6 +13,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <netinet/tcp.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);
 #endif
 
+#ifdef TCP_USER_TIMEOUT
+			newsrv->tcp_ut = curproxy->defsrv.tcp_ut;
+#endif
+
 			cur_arg = 3;
 		} else {
 			newsrv = &curproxy->defsrv;