[HttpClient] Fix dealing with "HTTP/1.1 000 " responses

nicolas-grekas · nicolas-grekas · commit d793d03cb6e8 · 2021-12-14T17:20:50.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -340,15 +340,8 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
         }
 
         if ('' !== $data) {
-            try {
-                // Regular header line: add it to the list
-                self::addResponseHeaders([$data], $info, $headers);
-            } catch (TransportException $e) {
-                $multi->handlesActivity[$id][] = null;
-                $multi->handlesActivity[$id][] = $e;
-
-                return \strlen($data);
-            }
+            // Regular header line: add it to the list
+            self::addResponseHeaders([$data], $info, $headers);
 
             if (!str_starts_with($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
@@ -260,7 +260,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+)? ([1-9]\d\d)(?: |$)#', $h, $m)) {
+            if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? (\d\d\d)(?: |$)#', $h, $m)) {
                 if ($headers) {
                     $debug .= "< \r\n";
                     $headers = [];
@@ -275,10 +275,6 @@ private static function addResponseHeaders(array $responseHeaders, array &$info,
         }
 
         $debug .= "< \r\n";
-
-        if (!$info['http_code']) {
-            throw new TransportException(sprintf('Invalid or missing HTTP status line for "%s".', implode('', $info['url'])));
-        }
     }
 
     private function checkStatusCode()
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -66,6 +66,13 @@ public function invalidResponseFactoryProvider()
         ];
     }
 
+    public function testZeroStatusCode()
+    {
+        $client = new MockHttpClient(new MockResponse('', ['response_headers' => ['HTTP/1.1 000 ']]));
+        $response = $client->request('GET', 'https://foo.bar');
+        $this->assertSame(0, $response->getStatusCode());
+    }
+
     public function testThrowExceptionInBodyGenerator()
     {
         $mockHttpClient = new MockHttpClient([

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ private static function initialize(self $response): void`
`260`	`260`	`private static function addResponseHeaders(array $responseHeaders, array &$info, array &$headers, string &$debug = ''): void`
`261`	`261`	`{`
`262`	`262`	`foreach ($responseHeaders as $h) {`
`263`		`- if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([1-9]\d\d)(?: \|$)#', $h, $m)) {`
	`263`	`+ if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? (\d\d\d)(?: \|$)#', $h, $m)) {`
`264`	`264`	`if ($headers) {`
`265`	`265`	`$debug .= "< \r\n";`
`266`	`266`	`$headers = [];`
`@@ -275,10 +275,6 @@ private static function addResponseHeaders(array $responseHeaders, array &$info,`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`$debug .= "< \r\n";`
`278`		`-`
`279`		`- if (!$info['http_code']) {`
`280`		`- throw new TransportException(sprintf('Invalid or missing HTTP status line for "%s".', implode('', $info['url'])));`
`281`		`- }`
`282`	`278`	`}`
`283`	`279`
`284`	`280`	`private function checkStatusCode()`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,13 @@ public function invalidResponseFactoryProvider()`
`66`	`66`	`];`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ public function testZeroStatusCode()`
	`70`	`+ {`
	`71`	`+ $client = new MockHttpClient(new MockResponse('', ['response_headers' => ['HTTP/1.1 000 ']]));`
	`72`	`+ $response = $client->request('GET', 'https://foo.bar');`
	`73`	`+ $this->assertSame(0, $response->getStatusCode());`
	`74`	`+ }`
	`75`	`+`
`69`	`76`	`public function testThrowExceptionInBodyGenerator()`
`70`	`77`	`{`
`71`	`78`	`$mockHttpClient = new MockHttpClient([`