Use curl_multi_wait rather than curl_multi_poll (#1855)

vicroms · web-flow · commit 9673e02b2f6d · 2025-11-17T23:46:01.000-08:00
diff --git a/src/vcpkg/base/downloads.cpp b/src/vcpkg/base/downloads.cpp
@@ -214,10 +214,11 @@ namespace vcpkg
                 Checks::unreachable(VCPKG_LINE_INFO);
             }
 
-            mc = curl_multi_poll(multi_handle.get(), nullptr, 0, 1000, nullptr);
+            // we use curl_multi_wait rather than curl_multi_poll for wider compatibility
+            mc = curl_multi_wait(multi_handle.get(), nullptr, 0, 1000, nullptr);
             if (mc != CURLM_OK)
             {
-                Debug::println("curl_multi_poll failed:");
+                Debug::println("curl_multi_wait failed:");
                 Debug::println(msg::format(msgCurlFailedGeneric, msg::exit_code = static_cast<int>(mc))
                                    .append_raw(fmt::format(" ({}).", curl_multi_strerror(mc))));
                 Checks::unreachable(VCPKG_LINE_INFO);

Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,11 @@ namespace vcpkg`
`214`	`214`	`Checks::unreachable(VCPKG_LINE_INFO);`
`215`	`215`	`}`
`216`	`216`
`217`		`- mc = curl_multi_poll(multi_handle.get(), nullptr, 0, 1000, nullptr);`
	`217`	`+ // we use curl_multi_wait rather than curl_multi_poll for wider compatibility`
	`218`	`+ mc = curl_multi_wait(multi_handle.get(), nullptr, 0, 1000, nullptr);`
`218`	`219`	`if (mc != CURLM_OK)`
`219`	`220`	`{`
`220`		`- Debug::println("curl_multi_poll failed:");`
	`221`	`+ Debug::println("curl_multi_wait failed:");`
`221`	`222`	`Debug::println(msg::format(msgCurlFailedGeneric, msg::exit_code = static_cast<int>(mc))`
`222`	`223`	`.append_raw(fmt::format(" ({}).", curl_multi_strerror(mc))));`
`223`	`224`	`Checks::unreachable(VCPKG_LINE_INFO);`