MDL-8469 increase memory limit everywhere due to changed calculation of used memory...

diff --git a/admin/cron.php b/admin/cron.php
index 47dfd097a2080bb902a1573e089b23b1474109ec..9c27ba85b8a882ab46264b5d99738ed737e82e0a 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -78,6 +78,9 @@
 /// no more headers and buffers
     while(@ob_end_flush());
 
+/// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
+    @raise_memory_limit('128M');
+
 /// Start output log
 
     $timenow  = time();
@@ -251,7 +254,7 @@
         //Execute backup's cron
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
-        @raise_memory_limit("128M");
+        @raise_memory_limit("196M");
         if (function_exists('apache_child_terminate')) {
             // if we are running from Apache, give httpd a hint that 
             // it can recycle the process after it's done. Apache's 

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index c8a4b3d9b422b89e9be7544f8752b9be9fdca672..6ee1b67f20b81ffc9820f7c118d7ce63258bfbe9 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -62,7 +62,7 @@ if ($um->preprocess_files() && confirm_sesskey()) {
     // that we'll take longer, and that the process should be recycled soon
     // to free up memory.
     @set_time_limit(0);
-    @raise_memory_limit("128M");
+    @raise_memory_limit("196M");
     if (function_exists('apache_child_terminate')) {
         @apache_child_terminate();
     }

diff --git a/backup/backup.php b/backup/backup.php
index 379f62185f7bb08246f9e0abeb8ba308fa2a1416..726b42ad4b5e2d6db110721ae4f31b18ec277dcb 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -111,7 +111,7 @@
 
     //Adjust some php variables to the execution of this script
     @ini_set("max_execution_time","3000");
-    raise_memory_limit("128M");
+    raise_memory_limit("196M");
 
     //Call the form, depending the step we are
     if (!$launch) {

diff --git a/backup/lib.php b/backup/lib.php
index 23b9d316642a2ce4bc87c1a3d317464b79c57d56..295cbdfbbddc51a6aa287a9d4f0adf722bd7105a 100644 (file)
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -658,7 +658,7 @@
         }
         
         @ini_set("max_execution_time","3000");
-        raise_memory_limit("128M");
+        raise_memory_limit("196M");
             
         if (!$backup_unique_code = restore_precheck($destinationcourse,$pathtofile,$errorstr,true)) {
             mtrace($debuginfo.'Failed restore_precheck (error was '.$errorstr.')');

diff --git a/backup/restore.php b/backup/restore.php
index cbd2cf0d58c2e6cf35e50dba02fec5a0170585ea..0cd1887e9f553037a84b3670c2390cac5f146f6f 100644 (file)
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -132,7 +132,7 @@
     
     //Adjust some php variables to the execution of this script
     @ini_set("max_execution_time","3000");
-    raise_memory_limit("128M");
+    raise_memory_limit("196M");
 
     //Call the form, depending the step we are
 

diff --git a/backup/try.php b/backup/try.php
index 967feffe3a5888bc4f4afd538445be285e9db6dd..9ce12ae5dc600a4ce790b6ec5a8211fb7c072ac8 100644 (file)
--- a/backup/try.php
+++ b/backup/try.php
@@ -19,7 +19,7 @@
 
     //Adjust some php variables to the execution of this script
     @ini_set("max_execution_time","3000");
-    raise_memory_limit("128M");
+    raise_memory_limit("196M");
 
     echo "<pre>\n";
 

diff --git a/lib/setup.php b/lib/setup.php
index 995eb3194a1752671a6b3596949eefc9af28869b..74405d61154b3d86e65e256a3d90bddccd326927 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -182,7 +182,7 @@ global $HTTPSPAGEREQUIRED;
     }
 
 /// Increase memory limits if possible
-    raise_memory_limit('64M');    // We should never NEED this much but just in case...
+    raise_memory_limit('96M');    // We should never NEED this much but just in case...
 
 /// Load up standard libraries
 

diff --git a/mod/data/import.php b/mod/data/import.php
index ef0f929eea5d892e4ad4636939136bf5417013a0..53a82644aabe502c2d4804780e825d9ab0c0b922 100755 (executable)
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -99,7 +99,7 @@
         // that we'll take longer, and that the process should be recycled soon
         // to free up memory.
         @set_time_limit(0);
-        @raise_memory_limit("64M");
+        @raise_memory_limit("96M");
         if (function_exists('apache_child_terminate')) {
             @apache_child_terminate();
         }