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 4741651b933e077d7dc9d85355e29df1c2013e30..b664831baa6ce49de39c5fe3666c32fadb77bcd4 100644 (file)
--- 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 2bba49ff3b8773d770337f5ba44ba3e8bcd8b8d6..42a45c65dae39d4f012724cfc87179f069dea4b0 100644 (file)
--- 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;