Skip to content

Commit 046bc56

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [HttpClient] Don't ignore errors from curl_multi_exec() [HttpClient] Double check if handle is complete CI for macOS [DependencyInjection] Resolve ChildDefinition in AbstractRecursivePass [Translation] [Bridge] [Lokalise] Fix push keys to lokalise. Closes #… [PropertyAccess] Fix accessing public property in Object [Process] fixed uppercase ARGC and ARGV should also be skipped [PropertyAccess] Add tests accessing public (dynamic) properties [Mailer] Update docs for sendmail -t [FrameworkBundle] Fix cache pool configuration with one adapter and one provider [FrameworkBundle] Use correct cookie domain in loginUser() Missing translations for Belarusian (be) #41032
2 parents f8bcc85 + 4d46e5b commit 046bc56

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Response/CurlResponse.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,16 @@ private static function perform(ClientState $multi, array &$responses = null): v
299299
self::$performing = true;
300300
++$multi->execCounter;
301301
$active = 0;
302-
while (\CURLM_CALL_MULTI_PERFORM === curl_multi_exec($multi->handle, $active));
302+
while (\CURLM_CALL_MULTI_PERFORM === ($err = curl_multi_exec($multi->handle, $active)));
303+
304+
if (\CURLM_OK !== $err) {
305+
throw new TransportException(curl_multi_strerror($err));
306+
}
303307

304308
while ($info = curl_multi_info_read($multi->handle)) {
309+
if (\CURLMSG_DONE !== $info['msg']) {
310+
continue;
311+
}
305312
$result = $info['result'];
306313
$id = (int) $ch = $info['handle'];
307314
$waitFor = @curl_getinfo($ch, \CURLINFO_PRIVATE) ?: '_0';

0 commit comments

Comments
 (0)