RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: connections: Don't call shutdown() if we want to disable linger.

Browse Source 
In conn_sock_shutw(), avoid calling shutdown() if linger_risk is set. Not
doing so will result in getting sockets in TIME_WAIT for some time.
This is particularly observable with health checks.

This should be backported to 1.9.
This commit is contained in:
Olivier Houchard 2019-06-14 15:26:06 +02:00 committed by Olivier Houchard
parent 86eded6c69
commit fe4abe62c7
1 changed files with 2 additions and 1 deletions

3
include/proto/connection.h
View File

@ -352,7 +352,8 @@ static inline void conn_sock_shutw(struct connection *c, int clean)
/* don't perform a clean shutdown if we're going to reset or /* don't perform a clean shutdown if we're going to reset or
* if the shutr was already received. * if the shutr was already received.
*/ */
if (conn_ctrl_ready(c) && !(c->flags & CO_FL_SOCK_RD_SH) && clean) if (conn_ctrl_ready(c) && !(c->flags & CO_FL_SOCK_RD_SH) && clean &&
!fdtab[c->handle.fd].linger_risk)
shutdown(c->handle.fd, SHUT_WR); shutdown(c->handle.fd, SHUT_WR);
} }