diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpClient] skip executing the multi handle when it's freed already

Browse Source
This commit is contained in:
Nicolas Grekas 2020-10-13 10:06:18 +02:00
parent 4f8384829c
commit a580688ee5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/HttpClient/CurlHttpClient.php
View File

@ -320,18 +320,16 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
*/ */
public function stream($responses, float $timeout = null): ResponseStreamInterface public function stream($responses, float $timeout = null): ResponseStreamInterface
{ {
if (!\is_resource($this->multi->handle) && !$this->multi->handle instanceof \CurlMultiHandle) {
$responses = [];
}
if ($responses instanceof CurlResponse) { if ($responses instanceof CurlResponse) {
$responses = [$responses]; $responses = [$responses];
} elseif (!is_iterable($responses)) { } elseif (!is_iterable($responses)) {
throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
} }
$active = 0; if (\is_resource($this->multi->handle) || $this->multi->handle instanceof \CurlMultiHandle) {
while (\CURLM_CALL_MULTI_PERFORM === curl_multi_exec($this->multi->handle, $active)); $active = 0;
while (\CURLM_CALL_MULTI_PERFORM === curl_multi_exec($this->multi->handle, $active));
}
return new ResponseStream(CurlResponse::stream($responses, $timeout)); return new ResponseStream(CurlResponse::stream($responses, $timeout));
} }