diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-10-10 10:05:20 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-10-10 10:05:20 -0500 |
| commit | 3e694f784d490eeec2fe71015a16316db4a17cb9 (patch) | |
| tree | 7f2b9fee76e6b60f1df2cf743061781fa7517014 /phpBB/install/database_update.php | |
| parent | cba383d139a313d0742d06f6ee8bee91332a1c7b (diff) | |
| download | forums-3e694f784d490eeec2fe71015a16316db4a17cb9.tar forums-3e694f784d490eeec2fe71015a16316db4a17cb9.tar.gz forums-3e694f784d490eeec2fe71015a16316db4a17cb9.tar.bz2 forums-3e694f784d490eeec2fe71015a16316db4a17cb9.tar.xz forums-3e694f784d490eeec2fe71015a16316db4a17cb9.zip | |
[ticket/11902] Set max execution time to 0 in db update
PHPBB3-11902
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b79420ab71..2526657bf9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -203,7 +203,14 @@ $migrations = $finder $migrator->set_migrations($migrations); // What is a safe limit of execution time? Half the max execution time should be safe. -$safe_time_limit = (ini_get('max_execution_time') / 2); +// No more than 15 seconds so the user isn't sitting and waiting for a very long time +$safe_time_limit = min(15, (ini_get('max_execution_time') / 2)); + +// While we're going to try limit this to half the max execution time, +// we want to try and take additional measures to prevent hitting the +// max execution time (if, say, one migration step takes much longer +// than the max execution time) +set_time_limit(0); while (!$migrator->finished()) { |