CI runs \o/ (but still red)

Author: nicolas-grekas

src/Symfony/Component/HttpClient/Internal/AmpBody.php

@@ -27,6 +27,7 @@
 class AmpBody implements HttpContent, ReadableStream, \IteratorAggregate
 {
     private ReadableStream $body;
+    private ?string $content;
     private array $info;
     private \Closure $onProgress;
     private ?int $offset = 0;
@@ -48,6 +49,7 @@ public function __construct($body, &$info, \Closure $onProgress)
         } elseif (\is_string($body)) {
             $this->length = \strlen($body);
             $this->body = new ReadableBuffer($body);
+            $this->content = $body;
         } else {
             $this->body = new ReadableIterableStream((static function () use ($body) {
                 while ('' !== $data = ($body)(16372)) {
@@ -134,14 +136,12 @@ public static function rewind(HttpContent $body): HttpContent
 
         $body->uploaded = null;
 
-        if ($body->body instanceof ReadableResourceStream) {
+        if ($body->body instanceof ReadableResourceStream && !$body->body->isClosed()) {
             fseek($body->body->getResource(), $body->offset);
-
-            return new $body($body->body->getResource(), $body->info, $body->onProgress);
         }
 
         if ($body->body instanceof ReadableBuffer) {
-            return new $body($body->body->read(), $body->info, $body->onProgress);
+            return new $body($body->content, $body->info, $body->onProgress);
         }
 
         return $body;

src/Symfony/Component/HttpClient/Response/AmpResponse.php

@@ -106,6 +106,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti
 
         $this->canary = new Canary(static function () use ($canceller, $multi, $id) {
             $canceller->cancel();
+            $multi->openHandles[$id]?->isComplete() || $multi->openHandles[$id]->complete();
             unset($multi->openHandles[$id], $multi->handlesActivity[$id]);
         });
 
@@ -132,7 +133,7 @@ public function __wakeup()
     public function __destruct()
     {
         try {
-            $this->doDestruct();
+            //$this->doDestruct();
         } finally {
             // Clear the DNS cache when all requests completed
             if (0 >= --$this->multi->responseCount) {
@@ -260,8 +261,6 @@ private static function generateResponse(Request $request, AmpClientState $multi
         } finally {
             $info['download_content_length'] = $info['size_download'];
         }
-
-        $multi->openHandles[$id]->complete();
     }
 
     private static function followRedirects(Request $originRequest, AmpClientState $multi, array &$info, array &$headers, DeferredCancellation $canceller, array $options, \Closure $onProgress, &$handle, ?LoggerInterface $logger, float &$pause): ?Response