Merge branch '6.1' into 6.2

* 6.1:
  [HttpKernel] Fix empty request stack when terminating with exception
  [HttpKernel] Remove EOL when using error_log() in HttpKernel Logger
  [HttpClient] Add test case for seeking into the content of RetryableHttpClient responses
  [HttpClient] Fix buffering after calling AsyncContext::passthru()
  s/annd/and
  s/gargage/garbage
  [HttpClient] fix merge
  [HttpClient] Don't override header if is x-www-form-urlencoded
  [Console] Fix error output on windows cli
  Reserve keys when using numeric ones
  add missing Azerbaijani translations
  fix few typos/inconsistencies in latvian translations
  Fix TypeError in Router when using UrlGenerator
  [Messenger] Fix amqp socket lost
  fix: use message object from event

Author: nicolas-grekas

HttpClientTrait.php

@@ -94,7 +94,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         if (isset($options['body'])) {
-            if (\is_array($options['body'])) {
+            if (\is_array($options['body']) && (!isset($options['normalized_headers']['content-type'][0]) || !str_contains($options['normalized_headers']['content-type'][0], 'application/x-www-form-urlencoded'))) {
                 $options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
             }
 

Response/AsyncContext.php

@@ -184,9 +184,15 @@ public function replaceResponse(ResponseInterface $response): ResponseInterface
 
     /**
      * Replaces or removes the chunk filter iterator.
+     *
+     * @param ?callable(ChunkInterface, self): ?\Iterator $passthru
      */
     public function passthru(callable $passthru = null): void
     {
-        $this->passthru = $passthru;
+        $this->passthru = $passthru ?? static function ($chunk, $context) {
+            $context->passthru = null;
+
+            yield $chunk;
+        };
     }
 }

Tests/HttpClientTraitTest.php

@@ -49,6 +49,25 @@ public function providePrepareRequestUrl(): iterable
         yield ['http://example.com/?b=', 'http://example.com/', ['a' => null, 'b' => '']];
     }
 
+    public function testPrepareRequestWithBodyIsArray()
+    {
+        $defaults = [
+            'base_uri' => 'http://example.com?c=c',
+            'query' => ['a' => 1, 'b' => 'b'],
+            'body' => []
+        ];
+        [, $defaults] = self::prepareRequest(null, null, $defaults);
+
+        [,$options] = self::prepareRequest(null, 'http://example.com', [
+            'body' => [1, 2],
+            'headers' => [
+                'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8'
+            ]
+        ], $defaults);
+
+        $this->assertContains('Content-Type: application/x-www-form-urlencoded; charset=utf-8', $options['headers']);
+    }
+
     /**
      * @dataProvider provideResolveUrl
      */

Tests/RetryableHttpClientTest.php

@@ -225,4 +225,22 @@ public function log($level, $message, array $context = []): void
         $this->assertNotNull($delay);
         $this->assertSame((int) ($retryAfter * 1000), $delay);
     }
+
+    public function testRetryOnErrorAssertContent()
+    {
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+               new MockResponse('', ['http_code' => 500]),
+               new MockResponse('Test out content', ['http_code' => 200]),
+            ]),
+            new GenericRetryStrategy([500], 0),
+            1
+        );
+
+        $response = $client->request('GET', 'http://example.com/foo-bar');
+
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('Test out content', $response->getContent());
+        self::assertSame('Test out content', $response->getContent(), 'Content should be buffered');
+    }
 }