Merge branch '6.4' into 7.1

* 6.4:
  Fix Twig deprecation notice
  [DependencyInjection] Fix issue between decorator and service locator index
  [AssetMapper] Fix JsDeliver import regexp
  do not overwrite the host to request

CurlHttpClient.php

@@ -188,10 +188,10 @@ public function request(string $method, string $url, array $options = []): Respo
                 $multi->reset();
             }
 
-            foreach ($options['resolve'] as $host => $ip) {
-                $resolve[] = null === $ip ? "-$host:$port" : "$host:$port:$ip";
-                $multi->dnsCache->hostnames[$host] = $ip;
-                $multi->dnsCache->removals["-$host:$port"] = "-$host:$port";
+            foreach ($options['resolve'] as $resolveHost => $ip) {
+                $resolve[] = null === $ip ? "-$resolveHost:$port" : "$resolveHost:$port:$ip";
+                $multi->dnsCache->hostnames[$resolveHost] = $ip;
+                $multi->dnsCache->removals["-$resolveHost:$port"] = "-$resolveHost:$port";
             }
 
             $curlopts[\CURLOPT_RESOLVE] = $resolve;

Tests/CurlHttpClientTest.php

@@ -122,4 +122,20 @@ public function testOverridingInternalAttributesUsingCurlOptions()
             ],
         ]);
     }
+
+    public function testKeepAuthorizationHeaderOnRedirectToSameHostWithConfiguredHostToIpAddressMapping()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+        $response = $httpClient->request('POST', 'http://127.0.0.1:8057/301', [
+            'headers' => [
+                'Authorization' => 'Basic Zm9vOmJhcg==',
+            ],
+            'resolve' => [
+                'symfony.com' => '10.10.10.10',
+            ],
+        ]);
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('/302', $response->toArray()['REQUEST_URI'] ?? null);
+    }
 }