mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 17:45:18 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11902' into develop

Browse Source 
* EXreaction/ticket/11902:
  [ticket/11902] Use phpbb\php\ini class
  [ticket/11902] Prevent errors if set_time_limit disabled
  [ticket/11902] Set max execution time to 0 in db update
This commit is contained in:
Joas Schilling 2014-01-18 21:42:30 +01:00
commit 45ab32bf61
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/database_update.php
View File

@ -203,7 +203,15 @@ $migrations = $finder
$migrator->set_migrations($migrations); $migrator->set_migrations($migrations);
// What is a safe limit of execution time? Half the max execution time should be safe. // 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
$phpbb_ini = new \phpbb\php\ini();
$safe_time_limit = min(15, ($phpbb_ini->get_int('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()) while (!$migrator->finished())
{ {