From: Olivier Houchard <ohouchard@haproxy.com>
Date: Tue, 29 Jan 2019 15:05:02 +0000 (+0100)
Subject: BUG/MEDIUM: servers: Don't add an incomplete conn to the server idle list.
X-Git-Tag: v2.0-dev1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26da323cb9f72c34062a3f023950da100f4fef55;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: servers: Don't add an incomplete conn to the server idle list.

If we failed to add the connection to the session, only try to add it back
to the server idle list if it has a mux, otherwise the connection is
incomplete and unusable.

This should be backported to 1.9.
---

diff --git a/src/backend.c b/src/backend.c
index 26dcccff14..82c71c4feb 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1356,7 +1356,7 @@ int connect_server(struct stream *s)
 			if (alloced_cs)
 				si_release_endpoint(&s->si[1]);
 			srv_conn->owner = NULL;
-			if (!srv_add_to_idle_list(objt_server(srv_conn->target), srv_conn))
+			if (srv_conn->mux && !srv_add_to_idle_list(objt_server(srv_conn->target), srv_conn))
 			/* The server doesn't want it, let's kill the connection right away */
 				srv_conn->mux->destroy(srv_conn);
 			srv_conn = NULL;