cancel passthru

symfony · Sep 14, 2020 · 75d727f · 75d727f
1 parent 3a5f3f5
commit 75d727f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Symfony/Component/HttpClient/Retry/MultiplierRetryStrategy.php b/src/Symfony/Component/HttpClient/Retry/MultiplierRetryStrategy.php
@@ -67,10 +67,6 @@ public function __construct(array $statusCodes = [423, 425, 429, 500, 502,  503,
         $this->maxDelayMilliseconds = $maxDelayMilliseconds;
     }
 
-    public function shouldRetry(ResponseInterface $response, \Throwable $throwable = null): bool
-    {
-    }
-
     public function isRetryable(int $retryCount, ResponseInterface $response, \Throwable $throwable = null): bool
     {
         if ($retryCount >= $this->maxRetries) {

diff --git a/src/Symfony/Component/HttpClient/RetryHttpClient.php b/src/Symfony/Component/HttpClient/RetryHttpClient.php
@@ -47,8 +47,15 @@ public function request(string $method, string $url, array $options = []): Respo
         return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options) {
             $exception = null;
             try {
+                if ($chunk->isTimeout() || null !== $chunk->getInformationalStatus()) {
+                    yield $chunk;
+
+                    return;
+                }
+
                 // only retry first chunk
-                if ($chunk->isTimeout() || !$chunk->isFirst()) {
+                if (!$chunk->isFirst()) {
+                    $context->passthru();
                     yield $chunk;
 
                     return;
@@ -58,6 +65,7 @@ public function request(string $method, string $url, array $options = []): Respo
             }
 
             if (!$this->strategy->isRetryable($this->retryCount, $response = $context->getResponse(), $exception)) {
+                $context->passthru();
                 yield $chunk;
 
                 return;