[HttpClient] fix monitoring timeouts when other streams are active

Author: nicolas-grekas

Test/HttpClientTestCase.php

@@ -786,6 +786,30 @@ public function testUncheckedTimeoutThrows()
         }
     }
 
+    public function testTimeoutWithActiveConcurrentStream()
+    {
+        $p1 = TestHttpServer::start(8067);
+        $p2 = TestHttpServer::start(8077);
+
+        $client = $this->getHttpClient(__FUNCTION__);
+        $streamingResponse = $client->request('GET', 'http://localhost:8067/max-duration');
+        $blockingResponse = $client->request('GET', 'http://localhost:8077/timeout-body', [
+            'timeout' => 0.25,
+        ]);
+
+        $this->assertSame(200, $streamingResponse->getStatusCode());
+        $this->assertSame(200, $blockingResponse->getStatusCode());
+
+        $this->expectException(TransportExceptionInterface::class);
+
+        try {
+            $blockingResponse->getContent();
+        } finally {
+            $p1->stop();
+            $p2->stop();
+        }
+    }
+
     public function testDestruct()
     {
         $client = $this->getHttpClient(__FUNCTION__);

Test/TestHttpServer.php

@@ -19,23 +19,28 @@
  */
 class TestHttpServer
 {
-    private static $process;
+    private static $process = [];
 
-    public static function start()
+    public static function start(int $port = 8057)
     {
-        if (self::$process) {
-            self::$process->stop();
+        if (isset(self::$process[$port])) {
+            self::$process[$port]->stop();
+        } else {
+            register_shutdown_function(static function () use ($port) {
+                self::$process[$port]->stop();
+            });
         }
 
         $finder = new PhpExecutableFinder();
-        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:8057']));
+        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:'.$port]));
         $process->setWorkingDirectory(__DIR__.'/Fixtures/web');
         $process->start();
+        self::$process[$port] = $process;
 
         do {
             usleep(50000);
-        } while (!@fopen('http://127.0.0.1:8057/', 'r'));
+        } while (!@fopen('http://127.0.0.1:'.$port, 'r'));
 
-        self::$process = $process;
+        return $process;
     }
 }