From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 13 Dec 2017 20:52:41 +0000 (+0100)
Subject: lib-http: client: peer: Properly handle claiming an existing connection.
X-Git-Tag: 2.3.0.rc1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af7956fbd15f4ea875644df1a1cb5b97840d2d7b;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: client: peer: Properly handle claiming an existing connection.

If no other connections were being created, request handling was not restarted.
This problem sometimes caused the client to hang.
Fixed by calling http_client_peer_connection_success() upon claiming an existing connection.
---

diff --git a/src/lib-http/http-client-peer.c b/src/lib-http/http-client-peer.c
index 35252940e1..8d1bda4786 100644
--- a/src/lib-http/http-client-peer.c
+++ b/src/lib-http/http-client-peer.c
@@ -734,6 +734,7 @@ http_client_peer_do_connect(struct http_client_peer *peer,
 	struct http_client_peer_pool *ppool = peer->ppool;
 	struct http_client_connection *const *idle_conns;
 	unsigned int i, idle_count;
+	bool claimed_existing = FALSE;
 
 	if (count == 0)
 		return;
@@ -741,6 +742,7 @@ http_client_peer_do_connect(struct http_client_peer *peer,
 	idle_conns = array_get(&ppool->idle_conns, &idle_count);
 	for (i = 0; i < count && i < idle_count; i++) {
 		http_client_connection_claim_idle(idle_conns[i], peer);
+		claimed_existing = TRUE;
 
 		e_debug(peer->event,
 			"Claimed idle connection (connections=%u)",
@@ -752,6 +754,9 @@ http_client_peer_do_connect(struct http_client_peer *peer,
 			"Making new connection %u of %u", i+1, count);
 		(void)http_client_connection_create(peer);
 	}
+
+	if (claimed_existing)
+		http_client_peer_connection_success(peer);
 }
 
 static void