Merge branch '6.4' into 7.2

* 6.4:
  [Process] Fix process status tracking
  [HttpClient] Fix buffering AsyncResponse with no passthru
  [HttpClient] Fix uploading files > 2GB
  [Mime] use isRendered method to avoid rendering an email twice

Author: nicolas-grekas

src/Symfony/Bridge/Twig/Mime/BodyRenderer.php

@@ -43,7 +43,7 @@ public function render(Message $message): void
             return;
         }
 
-        if (null === $message->getTextTemplate() && null === $message->getHtmlTemplate()) {
+        if ($message->isRendered()) {
             // email has already been rendered
             return;
         }

src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php

@@ -105,10 +105,14 @@ public function testRenderedOnce()
         ;
         $email->textTemplate('text');
 
+        $this->assertFalse($email->isRendered());
         $renderer->render($email);
+        $this->assertTrue($email->isRendered());
+
         $this->assertEquals('Text', $email->getTextBody());
 
         $email->text('reset');
+        $this->assertTrue($email->isRendered());
 
         $renderer->render($email);
         $this->assertEquals('reset', $email->getTextBody());

src/Symfony/Component/HttpClient/CurlHttpClient.php

@@ -241,7 +241,7 @@ public function request(string $method, string $url, array $options = []): Respo
             }
 
             if (\is_resource($body)) {
-                $curlopts[\CURLOPT_INFILE] = $body;
+                $curlopts[\CURLOPT_READDATA] = $body;
             } else {
                 $curlopts[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) {
                     static $eof = false;
@@ -320,6 +320,9 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         foreach ($curlopts as $opt => $value) {
+            if (\CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {
+                $opt = 115; // 115 === CURLOPT_INFILESIZE_LARGE, but it's not defined in PHP
+            }
             if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt && (!\defined('CURLOPT_HEADEROPT') || \CURLOPT_HEADEROPT !== $opt)) {
                 $constantName = $this->findConstantName($opt);
                 throw new TransportException(\sprintf('Curl option "%s" is not supported.', $constantName ?? $opt));
@@ -476,7 +479,7 @@ private function validateExtraCurlOptions(array $options): void
             \CURLOPT_RESOLVE => 'resolve',
             \CURLOPT_NOSIGNAL => 'timeout',
             \CURLOPT_HTTPHEADER => 'headers',
-            \CURLOPT_INFILE => 'body',
+            \CURLOPT_READDATA => 'body',
             \CURLOPT_READFUNCTION => 'body',
             \CURLOPT_INFILESIZE => 'body',
             \CURLOPT_POSTFIELDS => 'body',

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

@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpClient\Response;
 
 use Symfony\Component\HttpClient\Chunk\ErrorChunk;
-use Symfony\Component\HttpClient\Chunk\FirstChunk;
 use Symfony\Component\HttpClient\Chunk\LastChunk;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Contracts\HttpClient\ChunkInterface;
@@ -245,7 +244,7 @@ public static function stream(iterable $responses, ?float $timeout = null, ?stri
                 $wrappedResponses[] = $r->response;
 
                 if ($r->stream) {
-                    yield from self::passthruStream($response = $r->response, $r, new FirstChunk(), $asyncMap);
+                    yield from self::passthruStream($response = $r->response, $r, $asyncMap, new LastChunk());
 
                     if (!isset($asyncMap[$response])) {
                         array_pop($wrappedResponses);
@@ -276,15 +275,9 @@ public static function stream(iterable $responses, ?float $timeout = null, ?stri
                 }
 
                 if (!$r->passthru) {
-                    if (null !== $chunk->getError() || $chunk->isLast()) {
-                        unset($asyncMap[$response]);
-                    } elseif (null !== $r->content && '' !== ($content = $chunk->getContent()) && \strlen($content) !== fwrite($r->content, $content)) {
-                        $chunk = new ErrorChunk($r->offset, new TransportException(\sprintf('Failed writing %d bytes to the response buffer.', \strlen($content))));
-                        $r->info['error'] = $chunk->getError();
-                        $r->response->cancel();
-                    }
+                    $r->stream = (static fn () => yield $chunk)();
+                    yield from self::passthruStream($response, $r, $asyncMap);
 
-                    yield $r => $chunk;
                     continue;
                 }
 
@@ -347,13 +340,13 @@ private static function passthru(HttpClientInterface $client, self $r, ChunkInte
         }
         $r->stream = $stream;
 
-        yield from self::passthruStream($response, $r, null, $asyncMap);
+        yield from self::passthruStream($response, $r, $asyncMap);
     }
 
     /**
      * @param \SplObjectStorage<ResponseInterface, AsyncResponse>|null $asyncMap
      */
-    private static function passthruStream(ResponseInterface $response, self $r, ?ChunkInterface $chunk, ?\SplObjectStorage $asyncMap): \Generator
+    private static function passthruStream(ResponseInterface $response, self $r, ?\SplObjectStorage $asyncMap, ?ChunkInterface $chunk = null): \Generator
     {
         while (true) {
             try {

src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php

@@ -231,6 +231,20 @@ public function testBufferPurePassthru()
 
         $this->assertStringContainsString('SERVER_PROTOCOL', $response->getContent());
         $this->assertStringContainsString('HTTP_HOST', $response->getContent());
+
+        $client = new class(parent::getHttpClient(__FUNCTION__)) implements HttpClientInterface {
+            use AsyncDecoratorTrait;
+
+            public function request(string $method, string $url, array $options = []): ResponseInterface
+            {
+                return new AsyncResponse($this->client, $method, $url, $options);
+            }
+        };
+
+        $response = $client->request('GET', 'http://localhost:8057/');
+
+        $this->assertStringContainsString('SERVER_PROTOCOL', $response->getContent());
+        $this->assertStringContainsString('HTTP_HOST', $response->getContent());
     }
 
     public function testRetryTimeout()

src/Symfony/Component/Process/Process.php

@@ -82,7 +82,6 @@ class Process implements \IteratorAggregate
     private WindowsPipes|UnixPipes $processPipes;
 
     private ?int $latestSignal = null;
-    private ?int $cachedExitCode = null;
 
     private static ?bool $sigchild = null;
     private static array $executables = [];
@@ -1324,21 +1323,10 @@ protected function updateStatus(bool $blocking): void
             return;
         }
 
-        $this->processInformation = proc_get_status($this->process);
-        $running = $this->processInformation['running'];
-
-        // In PHP < 8.3, "proc_get_status" only returns the correct exit status on the first call.
-        // Subsequent calls return -1 as the process is discarded. This workaround caches the first
-        // retrieved exit status for consistent results in later calls, mimicking PHP 8.3 behavior.
-        if (\PHP_VERSION_ID < 80300) {
-            if (!isset($this->cachedExitCode) && !$running && -1 !== $this->processInformation['exitcode']) {
-                $this->cachedExitCode = $this->processInformation['exitcode'];
-            }
-
-            if (isset($this->cachedExitCode) && !$running && -1 === $this->processInformation['exitcode']) {
-                $this->processInformation['exitcode'] = $this->cachedExitCode;
-            }
+        if ($this->processInformation['running'] ?? true) {
+            $this->processInformation = proc_get_status($this->process);
         }
+        $running = $this->processInformation['running'];
 
         $this->readPipes($running && $blocking, '\\' !== \DIRECTORY_SEPARATOR || !$running);
 

src/Symfony/Component/Process/Tests/ProcessTest.php

@@ -732,6 +732,9 @@ public function testProcessIsSignaledIfStopped()
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
+        if (\PHP_VERSION_ID < 80300 && isset($_SERVER['GITHUB_ACTIONS'])) {
+            $this->markTestSkipped('Transient on GHA with PHP < 8.3');
+        }
 
         $process = $this->getProcessForCode('sleep(32);');
         $process->start();