]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: fix ignored values for half-closed timeouts (client-fin and server-fin...
authorSimone Gotti <simone.gotti@gmail.com>
Wed, 11 Jun 2014 10:25:28 +0000 (12:25 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 11 Jun 2014 19:07:16 +0000 (21:07 +0200)
Signed-off-by: Simone Gotti <simone.gotti@gmail.com>
WT: bug introduced with the new feature in 1.5-dev25, no backport is needed.

src/cfgparse.c

index 35f1824b173e0d871fa7ca7a372ffb445c1cc6f1..a3edc32d9106dd6c6463f87c41d052315f0d85dc 100644 (file)
@@ -2007,6 +2007,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 
                if (curproxy->cap & PR_CAP_FE) {
                        curproxy->timeout.client = defproxy.timeout.client;
+                       curproxy->timeout.clientfin = defproxy.timeout.clientfin;
                        curproxy->timeout.tarpit = defproxy.timeout.tarpit;
                        curproxy->timeout.httpreq = defproxy.timeout.httpreq;
                        curproxy->timeout.httpka = defproxy.timeout.httpka;
@@ -2035,6 +2036,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                if (curproxy->cap & PR_CAP_BE) {
                        curproxy->timeout.connect = defproxy.timeout.connect;
                        curproxy->timeout.server = defproxy.timeout.server;
+                       curproxy->timeout.serverfin = defproxy.timeout.serverfin;
                        curproxy->timeout.check = defproxy.timeout.check;
                        curproxy->timeout.queue = defproxy.timeout.queue;
                        curproxy->timeout.tarpit = defproxy.timeout.tarpit;