valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-4845: Stop ignoring small timeouts

Browse Source 
Client: php

CURLOPT_TIMEOUT requires a long [0], so it seems that small values
like 0.2 are being rounded to 0, resulting in a lack of any timeout.

This change uses CURLOPT_TIMEOUT_MS, which the PHP documentation
says was "added in cURL 7.16.2. Available since PHP 5.2.3."

[0] https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html
This commit is contained in:
Jeremy Mikkola 2019-04-04 18:03:32 -07:00 committed by James E. King III
parent b261f3c0f1
commit 79c2337705
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/php/lib/Transport/TCurlClient.php
View File

@ -230,7 +230,12 @@ class TCurlClient extends TTransport
curl_setopt(self::$curlHandle, CURLOPT_HTTPHEADER, $headers);
if ($this->timeout_ > 0) {
curl_setopt(self::$curlHandle, CURLOPT_TIMEOUT, $this->timeout_);
if ($this->timeout_ < 1.0) {
// Timestamps smaller than 1 second are ignored when CURLOPT_TIMEOUT is used
curl_setopt(self::$curlHandle, CURLOPT_TIMEOUT_MS, 1000 * $this->timeout_);
} else {
curl_setopt(self::$curlHandle, CURLOPT_TIMEOUT, $this->timeout_);
}
}
curl_setopt(self::$curlHandle, CURLOPT_POSTFIELDS, $this->request_);
$this->request_ = '';