Skip to content

Commit 4d46e5b

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: [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 5157005 + 2ca6b99 commit 4d46e5b

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
@@ -297,9 +297,16 @@ private static function perform(ClientState $multi, array &$responses = null): v
297297
self::$performing = true;
298298
++$multi->execCounter;
299299
$active = 0;
300-
while (\CURLM_CALL_MULTI_PERFORM === curl_multi_exec($multi->handle, $active));
300+
while (\CURLM_CALL_MULTI_PERFORM === ($err = curl_multi_exec($multi->handle, $active)));
301+
302+
if (\CURLM_OK !== $err) {
303+
throw new TransportException(curl_multi_strerror($err));
304+
}
301305

302306
while ($info = curl_multi_info_read($multi->handle)) {
307+
if (\CURLMSG_DONE !== $info['msg']) {
308+
continue;
309+
}
303310
$result = $info['result'];
304311
$id = (int) $ch = $info['handle'];
305312
$waitFor = @curl_getinfo($ch, \CURLINFO_PRIVATE) ?: '_0';

0 commit comments

Comments
 (0)