bug #44878 [HttpClient] Turn negative timeout to a very long timeout (fancyweb)

fabpot · fabpot · commit c8865409de92 · 2022-01-01T15:47:42.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] Turn negative timeout to a very long timeout | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #44477 | License | MIT | Doc PR | - 0 keeps on throwing. Commits ------- 6360c31 [HttpClient] Turn negative timeout to a very long timeout
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -147,7 +147,10 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         // Finalize normalization of options
         $options['http_version'] = (string) ($options['http_version'] ?? '') ?: null;
-        $options['timeout'] = (float) ($options['timeout'] ?? ini_get('default_socket_timeout'));
+        if (0 > $options['timeout'] = (float) ($options['timeout'] ?? ini_get('default_socket_timeout'))) {
+            $options['timeout'] = 172800.0; // 2 days
+        }
+
         $options['max_duration'] = isset($options['max_duration']) ? (float) $options['max_duration'] : 0;
 
         return [$url, $options];
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -179,4 +179,13 @@ public function testDebugInfoOnDestruct()
 
         $this->assertNotEmpty($traceInfo['debug']);
     }
+
+    public function testNegativeTimeout()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $this->assertSame(200, $client->request('GET', 'http://localhost:8057', [
+            'timeout' => -1,
+        ])->getStatusCode());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -179,4 +179,13 @@ public function testDebugInfoOnDestruct()`
`179`	`179`
`180`	`180`	`$this->assertNotEmpty($traceInfo['debug']);`
`181`	`181`	`}`
	`182`	`+`
	`183`	`+ public function testNegativeTimeout()`
	`184`	`+ {`
	`185`	`+ $client = $this->getHttpClient(__FUNCTION__);`
	`186`	`+`
	`187`	`+ $this->assertSame(200, $client->request('GET', 'http://localhost:8057', [`
	`188`	`+ 'timeout' => -1,`
	`189`	`+ ])->getStatusCode());`
	`190`	`+ }`
`182`	`191`	`}`