diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpClient] Turn negative timeout to a very long timeout

Browse Source
This commit is contained in:
Thomas Calvet 2021-12-31 15:34:09 +01:00
parent 69d4d6dddf
commit 6360c316e5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/HttpClient/HttpClientTrait.php
View File

@ -147,7 +147,10 @@ trait HttpClientTrait
// 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];

9
src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
View File

@ -179,4 +179,13 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase
$this->assertNotEmpty($traceInfo['debug']);
}
public function testNegativeTimeout()
{
$client = $this->getHttpClient(__FUNCTION__);
$this->assertSame(200, $client->request('GET', 'http://localhost:8057', [
'timeout' => -1,
])->getStatusCode());
}
}