fix(install): time limit when upgrading from glpi

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
flyve-mdm · Sep 7, 2018 · 081a8cd · 081a8cd
1 parent d28308a
commit 081a8cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/install/install.class.php b/install/install.class.php
@@ -480,6 +480,10 @@ public function upgrade(Migration $migration) {
       $this->migration = $migration;
       $fromSchemaVersion = $this->getSchemaVersion();
 
+      // Prevent problem of execution time
+      ini_set("max_execution_time", "0");
+      ini_set("memory_limit", "-1");
+
       switch ($fromSchemaVersion) {
          case '0.0':
             // Upgrade to 2.0

diff --git a/tools/cli_install.php b/tools/cli_install.php
@@ -69,9 +69,7 @@
    define("GLPI_CONFIG_DIR", GLPI_ROOT . "/tests");
 }
 
-// Prevent problem of execution time
-ini_set("max_execution_time", "0");
-ini_set("memory_limit", "-1");
+// disable session cookie for CLI mode
 ini_set("session.use_cookies", "0");
 
 include (__DIR__ . "/../../../inc/includes.php");