Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
This commit is contained in:
Rasmus Lerdorf 2019-05-21 14:47:28 -07:00
commit 3345d71109

View File

@ -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);