Skip to content

Commit 89aac61

Browse files
[HttpClient] fix segfault when canary is triggered after the curl handle is destructed
1 parent 343f824 commit 89aac61

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Response/TransportResponseTrait.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*/
2828
trait TransportResponseTrait
2929
{
30+
private $canary;
3031
private $headers = [];
3132
private $info = [
3233
'response_headers' => [],
@@ -41,7 +42,6 @@ trait TransportResponseTrait
4142
private $timeout = 0;
4243
private $inflate;
4344
private $finalInfo;
44-
private $canary;
4545
private $logger;
4646

4747
/**
@@ -174,13 +174,12 @@ public static function stream(iterable $responses, float $timeout = null): \Gene
174174
foreach ($responses as $j => $response) {
175175
$timeoutMax = $timeout ?? max($timeoutMax, $response->timeout);
176176
$timeoutMin = min($timeoutMin, $response->timeout, 1);
177+
$chunk = false;
177178

178179
if ($fromLastTimeout && null !== $multi->lastTimeout) {
179180
$elapsedTimeout = microtime(true) - $multi->lastTimeout;
180181
}
181182

182-
$chunk = false;
183-
184183
if (isset($multi->handlesActivity[$j])) {
185184
$multi->lastTimeout = null;
186185
} elseif (!isset($multi->openHandles[$j])) {

0 commit comments

Comments
 (0)