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
atdt · May 21, 2019 · 2d29263 · 2d29263
2 parents 97ba6b0 + 7b42cdf
commit 2d29263
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);