diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-01-04 09:27:51 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-01-04 09:27:51 +0000 |
| commit | 3dae958731450beeda816286b947016ec263ded1 (patch) | |
| tree | ddcce9225639286b5e7efb2f5a4b08721586b133 /update.php | |
| parent | 83cb8d9e95367c466209726b809e10e82c7e0f97 (diff) | |
| download | brdo-3dae958731450beeda816286b947016ec263ded1.tar.gz brdo-3dae958731450beeda816286b947016ec263ded1.tar.bz2 | |
- Patch #43002 by drumm: critical bugfix: avoid infinite loops in update script.
Diffstat (limited to 'update.php')
| -rw-r--r-- | update.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/update.php b/update.php index 3ddce89ff..f5623e04f 100644 --- a/update.php +++ b/update.php @@ -387,12 +387,15 @@ function update_progress_page() { * the overall percent finished. The second element is a status message. */ function update_do_updates() { - while (($update = reset($_SESSION['update_remaining'])) && timer_read('page') < 1000) { + while (($update = reset($_SESSION['update_remaining']))) { $update_finished = update_data($update['module'], $update['version']); if ($update_finished) { // Dequeue the completed update. unset($_SESSION['update_remaining'][key($_SESSION['update_remaining'])]); } + if (timer_read('page') > 1000) { + break; + } } if ($_SESSION['update_total']) { |