From: Olivier Houchard <cognet@ci0.org>
Date: Mon, 16 Mar 2020 12:49:00 +0000 (+0100)
Subject: MEDIUM: connections: Kill connections even if we are reusing one.
X-Git-Tag: v2.2-dev5~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3397367dc7cec9e78c62c54efc24d9db5cde2d2;p=thirdparty%2Fhaproxy.git

MEDIUM: connections: Kill connections even if we are reusing one.

In connect_server(), if we notice we have more file descriptors opened than
we should, there's no reason not to close a connection just because we're
reusing one, so do it anyway.
---

diff --git a/src/backend.c b/src/backend.c
index cae3f20c52..96d8d17ad8 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1256,8 +1256,7 @@ int connect_server(struct stream *s)
 		}
 	}
 
-	if (((!reuse || (srv_conn && (srv_conn->flags & CO_FL_WAIT_XPRT)))
-	    && ha_used_fds > global.tune.pool_high_count) && srv && srv->idle_conns) {
+	if (ha_used_fds > global.tune.pool_high_count && srv && srv->idle_conns) {
 		struct connection *tokill_conn;
 
 		/* We can't reuse a connection, and e have more FDs than deemd