MDL-8469 - 192M is much nicer than 196M

diff --git a/admin/cron.php b/admin/cron.php
index 9c27ba85b8a882ab46264b5d99738ed737e82e0a..f7bc1f37e7a30e376def20722456dc6d311b9daf 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -254,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("196M");
+        @raise_memory_limit("192M");
         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 6ee1b67f20b81ffc9820f7c118d7ce63258bfbe9..377498a8de9aab1dfd3c0d3dacaedb61540265fe 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("196M");
+    @raise_memory_limit("192M");
     if (function_exists('apache_child_terminate')) {
         @apache_child_terminate();
     }

diff --git a/backup/backup.php b/backup/backup.php
index 726b42ad4b5e2d6db110721ae4f31b18ec277dcb..f87a6d4aa7dac94189cbd026796045b2bfaa537c 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("196M");
+    raise_memory_limit("192M");
 
     //Call the form, depending the step we are
     if (!$launch) {

diff --git a/backup/lib.php b/backup/lib.php
index 295cbdfbbddc51a6aa287a9d4f0adf722bd7105a..2bfb708def67e39d5211d0298e7aaccacae8e83e 100644 (file)
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -658,7 +658,7 @@
         }
         
         @ini_set("max_execution_time","3000");
-        raise_memory_limit("196M");
+        raise_memory_limit("192M");
             
         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 0cd1887e9f553037a84b3670c2390cac5f146f6f..df9b64cfd3e2293a32b755f6abcd69419f979c4f 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("196M");
+    raise_memory_limit("192M");
 
     //Call the form, depending the step we are
 

diff --git a/backup/try.php b/backup/try.php
index 9ce12ae5dc600a4ce790b6ec5a8211fb7c072ac8..01e025a47d64d92fb68642a95e24fb4aff183f41 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("196M");
+    raise_memory_limit("192M");
 
     echo "<pre>\n";