From: Frank Meier Date: Wed, 23 Feb 2022 14:35:06 +0000 (+0100) Subject: connect: make Curl_getconnectinfo work with conn cache from share handle X-Git-Tag: curl-7_83_0~174 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b169d5ea10db63d21ca24f4b5d4224c1535848c;p=thirdparty%2Fcurl.git connect: make Curl_getconnectinfo work with conn cache from share handle Closes #8524 --- diff --git a/lib/connect.c b/lib/connect.c index c2241b48a6..e0b7401471 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -74,6 +74,7 @@ #include "warnless.h" #include "conncache.h" #include "multihandle.h" +#include "share.h" #include "version_win32.h" #include "quic.h" #include "socks.h" @@ -1486,7 +1487,11 @@ curl_socket_t Curl_getconnectinfo(struct Curl_easy *data, find.id_tofind = data->state.lastconnect_id; find.found = NULL; - Curl_conncache_foreach(data, data->multi_easy? + Curl_conncache_foreach(data, + data->share && (data->share->specifier + & (1<< CURL_LOCK_DATA_CONNECT))? + &data->share->conn_cache: + data->multi_easy? &data->multi_easy->conn_cache: &data->multi->conn_cache, &find, conn_is_conn);