minor #33452 [HttpClient] Fix a bug preventing Server Pushes to be handled properly (dunglas)

nicolas-grekas · nicolas-grekas · commit a99a4801a211 · 2019-09-03T23:34:18.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] Fix a bug preventing Server Pushes to be handled properly | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | n/a Follows #33444. Commits ------- e1fbaeb [HttpClient] Fix a bug preventing Server Pushes to be handled properly
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -106,8 +106,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $url = implode('', $url);
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['normalized_headers']['user-agent'][] = 'Symfony HttpClient/Curl';
-            $options['headers'][] = 'User-Agent: Symfony HttpClient/Curl';
+            $options['normalized_headers']['user-agent'][] = $options['headers'][] = 'User-Agent: Symfony HttpClient/Curl';
         }
 
         if ($pushedResponse = $this->multi->pushedResponses[$url] ?? null) {
@@ -364,7 +363,12 @@ private static function acceptPushForRequest(string $method, array $options, Pus
         }
 
         foreach (['authorization', 'cookie', 'range', 'proxy-authorization'] as $k) {
-            if (($pushedResponse->requestHeaders[$k] ?? null) !== ($options['normalized_headers'][$k] ?? null)) {
+            $normalizedHeaders = $options['normalized_headers'][$k] ?? [];
+            foreach ($normalizedHeaders as $i => $v) {
+                $normalizedHeaders[$i] = substr($v, \strlen($k) + 2);
+            }
+
+            if (($pushedResponse->requestHeaders[$k] ?? []) !== $normalizedHeaders) {
                 return false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ public function request(string $method, string $url, array $options = []): Respo`
`106`	`106`	`$url = implode('', $url);`
`107`	`107`
`108`	`108`	`if (!isset($options['normalized_headers']['user-agent'])) {`
`109`		`- $options['normalized_headers']['user-agent'][] = 'Symfony HttpClient/Curl';`
`110`		`- $options['headers'][] = 'User-Agent: Symfony HttpClient/Curl';`
	`109`	`+ $options['normalized_headers']['user-agent'][] = $options['headers'][] = 'User-Agent: Symfony HttpClient/Curl';`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`if ($pushedResponse = $this->multi->pushedResponses[$url] ?? null) {`
`@@ -364,7 +363,12 @@ private static function acceptPushForRequest(string $method, array $options, Pus`
`364`	`363`	`}`
`365`	`364`
`366`	`365`	`foreach (['authorization', 'cookie', 'range', 'proxy-authorization'] as $k) {`
`367`		`- if (($pushedResponse->requestHeaders[$k] ?? null) !== ($options['normalized_headers'][$k] ?? null)) {`
	`366`	`+ $normalizedHeaders = $options['normalized_headers'][$k] ?? [];`
	`367`	`+ foreach ($normalizedHeaders as $i => $v) {`
	`368`	`+ $normalizedHeaders[$i] = substr($v, \strlen($k) + 2);`
	`369`	`+ }`
	`370`	`+`
	`371`	`+ if (($pushedResponse->requestHeaders[$k] ?? []) !== $normalizedHeaders) {`
`368`	`372`	`return false;`
`369`	`373`	`}`
`370`	`374`	`}`