diff options
| -rw-r--r-- | it_url.class | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/it_url.class b/it_url.class index ea2771c..a937212 100644 --- a/it_url.class +++ b/it_url.class @@ -512,26 +512,29 @@ static function get_multi($p=null) unset($urls[$key]); $closehandle($key); } - - if (!$abort && count($handles) < $parallel && $iterator->valid()) - { - $addhandle($iterator->key(), $iterator->current()); - $iterator->next(); - } } } } while ($mrc == CURLM_CALL_MULTI_PERFORM); - foreach ((array)$sleepuntils as $key => $time) - { - if (microtime(true) >= $time && count($handles) < $parallel) + if (!$abort) { + foreach ((array)$sleepuntils as $key => $time) + { + if (microtime(true) >= $time && count($handles) < $parallel) + { + $addhandle($key, $urls[$key]); + unset($sleepuntils[$key]); + } + } + + while (count($handles) < $parallel && $iterator->valid()) { - $addhandle($key, $urls[$key]); - unset($sleepuntils[$key]); + $addhandle($iterator->key(), $iterator->current()); + $iterator->next(); } + + if ($sleepuntils && !count($handles)) + usleep(100000); } - if ($sleepuntils && !count($handles)) - usleep(100000); $timeout = 0.1; # Longer delay to avoid busy loop but shorter than default of 1s in case we stil hit cURL 7.25.0 problem } |