MDL-8469 increase memory limit everywhere due to changed calculation of used memory in PHP 5.2.x - the real memory useage is the same, but the reported size of used memory is now more accurate

This commit is contained in:
skodak 2007-02-14 20:46:38 +00:00
parent 0b906e7847
commit 4eefee9779
8 changed files with 11 additions and 8 deletions

View File

@ -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

View File

@ -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();
}

View File

@ -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) {

View File

@ -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.')');

View File

@ -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

View File

@ -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";

View File

@ -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

View File

@ -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();
}