summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-10-02 18:10:10 +0200
committerRemi Collet <fedora@famillecollet.com>2013-10-02 18:10:10 +0200
commitab532ebbc8de74f9f8de5207fdba2008cf68617b (patch)
tree79da54890abff6b131611088f0228379d3879b2e
parent3f12441c57b7145afd75b27f7afbb42eb7b04356 (diff)
glpi-fusioninventory: add upstream patch
-rw-r--r--fusioninventory-install.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/fusioninventory-install.patch b/fusioninventory-install.patch
new file mode 100644
index 0000000..1f10a67
--- /dev/null
+++ b/fusioninventory-install.patch
@@ -0,0 +1,34 @@
+commit 9252e8e3e4d3659dd54a4ea1632ec72d194c3ed2
+Author: David Durieux <d.durieux@siprossii.com>
+Date: Fri Sep 27 11:02:58 2013 +0200
+
+ Fix memory linit on install and update. closes #2259
+
+diff --git /install/install.php b/install/install.php
+index 7beb14a..ed6543a 100644
+--- fusioninventory/install/install.php
++++ fusioninventory/install/install.php
+@@ -43,6 +43,10 @@
+ function pluginFusioninventoryInstall($version, $migration='') {
+ global $DB;
+
++ ini_set("memory_limit", "-1");
++ ini_set("max_execution_time", "0");
++
++
+ if ($migration == '') {
+ $migration = new Migration($version);
+ }
+diff --git a/install/update.php b/install/update.php
+index 9431228..f2c686f 100644
+--- fusioninventory/install/update.php
++++ fusioninventory/install/update.php
+@@ -199,6 +199,8 @@ function pluginFusioninventoryUpdate($current_version, $migrationname='Migration
+ global $DB;
+
+ ini_set("max_execution_time", "0");
++ ini_set("memory_limit", "-1");
++
+
+ foreach (glob(GLPI_ROOT.'/plugins/fusioninventory/inc/*.php') as $file) {
+ require_once($file);