bug #36823 [HttpClient] fix PHP warning + accept status code >= 600 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit cc519aa5a90f · 2020-05-16T11:09:03.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] fix PHP warning + accept status code >= 600 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #36717 | License | MIT | Doc PR | - This fixes the PHP warning reported in the linked issue. This also relaxes the accepted status codes, with https://www.linkedin.com/company/linkedin/ as an example that returns a non-conformant one (`999`). These are now handled as 5xx codes, ie they trigger a ServerException. Commits ------- c764b5c [HttpClient] fix PHP warning + accept status code >= 600
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -312,8 +312,15 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
         }
 
         if ("\r\n" !== $data) {
-            // Regular header line: add it to the list
-            self::addResponseHeaders([substr($data, 0, -2)], $info, $headers);
+            try {
+                // Regular header line: add it to the list
+                self::addResponseHeaders([substr($data, 0, -2)], $info, $headers);
+            } catch (TransportException $e) {
+                $multi->handlesActivity[$id][] = null;
+                $multi->handlesActivity[$id][] = $e;
+
+                return \strlen($data);
+            }
 
             if (0 !== strpos($data, 'HTTP/')) {
                 if (0 === stripos($data, 'Location:')) {
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -253,7 +253,7 @@ private static function initialize(self $response): void
     private static function addResponseHeaders(array $responseHeaders, array &$info, array &$headers, string &$debug = ''): void
     {
         foreach ($responseHeaders as $h) {
-            if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([12345]\d\d)(?: |$)#', $h, $m)) {
+            if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([1-9]\d\d)(?: |$)#', $h, $m)) {
                 if ($headers) {
                     $debug .= "< \r\n";
                     $headers = [];

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private static function initialize(self $response): void`
`253`	`253`	`private static function addResponseHeaders(array $responseHeaders, array &$info, array &$headers, string &$debug = ''): void`
`254`	`254`	`{`
`255`	`255`	`foreach ($responseHeaders as $h) {`
`256`		`- if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([12345]\d\d)(?: \|$)#', $h, $m)) {`
	`256`	`+ if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([1-9]\d\d)(?: \|$)#', $h, $m)) {`
`257`	`257`	`if ($headers) {`
`258`	`258`	`$debug .= "< \r\n";`
`259`	`259`	`$headers = [];`