From 31a41d45b70310e7bce8166e16cb8039272b8335 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 22 Aug 2022 10:56:42 +0200 Subject: [PATCH] multi: have curl_multi_remove_handle close CONNECT_ONLY transfer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit αΊ‚hen it has been used in the multi interface, it is otherwise left in the connection cache, can't be reused and nothing will close them since the easy handle loses the association with the multi handle and thus the connection cache - until the multi handle is closed or it gets pruned because the cache is full. Reported-by: Dominik Thalhammer Fixes #9335 Closes #9342 --- lib/multi.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/multi.c b/lib/multi.c index a5217ee2c6d8ed..2527de3a6d5879 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -828,6 +828,24 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi, /* Remove the association between the connection and the handle */ Curl_detach_connection(data); + if(data->set.connect_only && !data->multi_easy) { + /* This removes a handle that was part the multi inteface that used + CONNECT_ONLY, that connection is now left alive but since this handle + has bits.close set nothing can use that transfer anymore and it is + forbidden from reuse. And this easy handle cannot find the connection + anymore once removed from the multi handle + + Better close the connection here, at once. + */ + struct connectdata *c; + curl_socket_t s; + s = Curl_getconnectinfo(data, &c); + if((s != CURL_SOCKET_BAD) && c) { + Curl_conncache_remove_conn(data, c, TRUE); + Curl_disconnect(data, c, TRUE); + } + } + if(data->state.lastconnect_id != -1) { /* Mark any connect-only connection for closure */ Curl_conncache_foreach(data, data->state.conn_cache,