From 1a133bffa2e7fa8ffb15bd59670c0880d6a17a5c Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Sat, 26 Oct 2019 19:54:02 +0200 Subject: [PATCH 1/4] Remove limit time for upgrade remove set_time_limit --- htdocs/install/upgrade2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 39e14283a40..428ed169022 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -64,7 +64,7 @@ $error = 0; // Ne fonctionne que si on est pas en safe_mode. $err=error_reporting(); error_reporting(0); -@set_time_limit(300); +//@set_time_limit(300); error_reporting($err); $setuplang=GETPOST("selectlang", 'aZ09', 3)?GETPOST("selectlang", 'aZ09', 3):'auto'; From 378d0b07812d058f1bc263b686722011f134ddd4 Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Sat, 2 Nov 2019 13:18:48 +0100 Subject: [PATCH 2/4] Update upgrade2.php --- htdocs/install/upgrade2.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 428ed169022..ece176a4c11 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -64,7 +64,10 @@ $error = 0; // Ne fonctionne que si on est pas en safe_mode. $err=error_reporting(); error_reporting(0); -//@set_time_limit(300); +if (! empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT)) + @set_time_limit((int)$conf->global->MAIN_OVERRIDE_TIME_LIMIT); +else + @set_time_limit(300); error_reporting($err); $setuplang=GETPOST("selectlang", 'aZ09', 3)?GETPOST("selectlang", 'aZ09', 3):'auto'; From 01d8c3bffde890f1017af8d9b003c81f5bcd8811 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Sat, 2 Nov 2019 12:20:32 +0000 Subject: [PATCH 3/4] Fixing style errors. --- htdocs/install/upgrade2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index ece176a4c11..38207f85ccc 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -65,7 +65,7 @@ $error = 0; $err=error_reporting(); error_reporting(0); if (! empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT)) - @set_time_limit((int)$conf->global->MAIN_OVERRIDE_TIME_LIMIT); + @set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT); else @set_time_limit(300); error_reporting($err); From a971943832e8879875c3e369a2b25ed95f56d001 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Nov 2019 13:45:27 +0100 Subject: [PATCH 4/4] Update upgrade2.php --- htdocs/install/upgrade2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 38207f85ccc..0787c84762b 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -67,7 +67,7 @@ error_reporting(0); if (! empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT)) @set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT); else - @set_time_limit(300); + @set_time_limit(600); error_reporting($err); $setuplang=GETPOST("selectlang", 'aZ09', 3)?GETPOST("selectlang", 'aZ09', 3):'auto';