- if ((CURLM_OK == curl_multi_timeout(curl->handle->multi, &max_tout)) && (max_tout > 0)) {
- timeout->tv_sec = max_tout / 1000;
- timeout->tv_usec = (max_tout % 1000) * 1000;
- } else {
- timeout->tv_sec = 0;
- timeout->tv_usec = 1000;
+ timeout->tv_sec = 0;
+ timeout->tv_usec = 0;
+
+ /* always returns CURLM_OK, check max_tout instead */
+ curl_multi_timeout(curl->handle->multi, &max_tout);
+
+ if (!max_tout) {
+ /* immediately */
+ return;