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

[ticket/14487] Try to handle connection timeouts

Browse Source 
PHPBB3-14487
This commit is contained in:
Máté Bartus
2016-02-28 00:19:24 +01:00
parent 30db51a86e
commit 062358f8b1
8 changed files with 210 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/phpbb/install/installer.php
View File

@@ -22,6 +22,7 @@ use phpbb\install\exception\resource_limit_reached_exception;
use phpbb\install\exception\user_interaction_required_exception;
use phpbb\install\helper\config;
use phpbb\install\helper\container_factory;
use phpbb\install\helper\iohandler\ajax_iohandler;
use phpbb\install\helper\iohandler\cli_iohandler;
use phpbb\install\helper\iohandler\iohandler_interface;
use phpbb\path_helper;
@@ -126,6 +127,11 @@ class installer
*/
public function run()
{
if ($this->iohandler instanceof ajax_iohandler)
{
$this->iohandler->acquire_lock();
}
// Load install progress
$this->install_config->load_config();
@@ -174,7 +180,16 @@ class installer
try
{
$iterator = $this->installer_modules->getIterator();
$iterator->seek($module_index);
if ($module_index < $iterator->count())
{
$iterator->seek($module_index);
}
else
{
$iterator->seek($module_index - 1);
$iterator->next();
}
while ($iterator->valid())
{
@@ -256,6 +271,11 @@ class installer
$fail_cleanup = true;
}
if ($this->iohandler instanceof ajax_iohandler)
{
$this->iohandler->release_lock();
}
if ($install_finished)
{
// Send install finished message