Merge branch '5.0'

* 5.0:
  [HttpClient] improve testTimeoutIsNotAFatalError
  Fix for #36715

Author: nicolas-grekas

Tests/HttpClientTestCase.php

@@ -109,7 +109,7 @@ public function testTimeoutIsNotAFatalError()
     {
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057/timeout-body', [
-            'timeout' => 0.1,
+            'timeout' => 0.3,
         ]);
 
         try {
@@ -118,8 +118,17 @@ public function testTimeoutIsNotAFatalError()
         } catch (TransportException $e) {
         }
 
-        usleep(400000);
-        $this->assertSame('<1><2>', $response->getContent());
+        for ($i = 0; $i < 10; ++$i) {
+            try {
+                $this->assertSame('<1><2>', $response->getContent());
+                break;
+            } catch (TransportException $e) {
+            }
+        }
+
+        if (10 === $i) {
+            throw $e;
+        }
     }
 
     public function testResponseStreamRewind()