From: Olivier Houchard <cognet@ci0.org>
Date: Tue, 20 Nov 2018 23:16:45 +0000 (+0100)
Subject: MEDIUM: connection: Don't bother reactivating polling after connection retry.
X-Git-Tag: v1.9-dev8~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66b5166af950ac1c5f0bb1bb5831b5f409b9fcf3;p=thirdparty%2Fhaproxy.git

MEDIUM: connection: Don't bother reactivating polling after connection retry.

As we now will no longer try tro subscribe to recv/send events before the
connection is established, there's no need to reactivate polling on the fd
when retrying connection. It will be activated later on subscribe.
---

diff --git a/src/stream.c b/src/stream.c
index 96e7f88654..e73d9a163e 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -918,22 +918,11 @@ static void sess_update_stream_int(struct stream *s)
 		srv = objt_server(s->target);
 
 		if (conn_err == SF_ERR_NONE) {
-			struct connection *conn;
-
-			conn = cs_conn(objt_cs(si->end));
 			/* state = SI_ST_CON or SI_ST_EST now */
 			if (srv)
 				srv_inc_sess_ctr(srv);
 			if (srv)
 				srv_set_sess_last(srv);
-			/* If we're retrying to connect to the server, and
-			 * somebody subscribed to recv or send events, we have
-			 * to make sure the polling is active on the new fd.
-			 */
-			if (conn->send_wait)
-				conn_xprt_want_send(conn);
-			if (conn->recv_wait)
-				conn_xprt_want_recv(conn);
 			return;
 		}