bug #33022 [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt (lyrixx)

nicolas-grekas · nicolas-grekas · commit fda49e699ae6 · 2019-08-08T08:39:53.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #33017 | License | MIT | Doc PR | - Commits ------- e289723 [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -140,7 +140,7 @@ public function request(string $method, string $url, array $options = []): Respo
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_MAXREDIRS => 0 < $options['max_redirects'] ? $options['max_redirects'] : 0,
             CURLOPT_COOKIEFILE => '', // Keep track of cookies during redirects
-            CURLOPT_CONNECTTIMEOUT_MS => 1000 * $options['timeout'],
+            CURLOPT_TIMEOUT => 0,
             CURLOPT_PROXY => $options['proxy'],
             CURLOPT_NOPROXY => $options['no_proxy'] ?? $_SERVER['no_proxy'] ?? $_SERVER['NO_PROXY'] ?? '',
             CURLOPT_SSL_VERIFYPEER => $options['verify_peer'],
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -583,6 +583,16 @@ public function testResolve()
         $client->request('GET', 'http://symfony.com:8057/', ['timeout' => 1]);
     }
 
+    public function testNotATimeout()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://localhost:8057/timeout-header', [
+            'timeout' => 0.5,
+        ]);
+        usleep(510000);
+        $this->assertSame(200, $response->getStatusCode());
+    }
+
     public function testTimeoutOnAccess()
     {
         $client = $this->getHttpClient(__FUNCTION__);
