diff options
| author | Rasmus Lerdorf <rasmus@lerdorf.com> | 2019-05-21 14:46:24 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@lerdorf.com> | 2019-05-21 14:46:24 -0700 |
| commit | 2d29263a9ff6fc400891c0de2d8e4ae194513f57 (patch) | |
| tree | f13ff26dc5aaa9d12548b7678e16a36012c542f8 | |
| parent | 97ba6b0d8bbb20b0d4a4a0c950b582f6cfeeea27 (diff) | |
| parent | 7b42cdf95ee91b723e7df51ac96f880de51f4591 (diff) | |
| download | php-git-2d29263a9ff6fc400891c0de2d8e4ae194513f57.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
| -rw-r--r-- | ext/curl/multi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index e2ac608483..bebe5d19c2 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -228,7 +228,7 @@ PHP_FUNCTION(curl_multi_select) } #if LIBCURL_VERSION_NUM >= 0x071c00 /* Available since 7.28.0 */ - error = curl_multi_wait(mh->multi, NULL, 0, (unsigned long) timeout * 1000.0, &numfds); + error = curl_multi_wait(mh->multi, NULL, 0, (unsigned long) (timeout * 1000.0), &numfds); if (CURLM_OK != error) { SAVE_CURLM_ERROR(mh, error); RETURN_LONG(-1); |