moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged from MOODLE_14_STABLE: Fixing handling of empty memory_limit for PHP without memory_limit (mostly Windows binaries)

Browse source
This commit is contained in:
martinlanghoff 2004-11-20 10:38:43 +00:00
parent 429a24b7fc
commit c95aa089a8
2 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/moodlelib.php
View file

@ -3254,9 +3254,19 @@ function raise_memory_limit ($newlimit) {
return false;
}
$cur = return_bytes(@ini_get('memory_limit'));
$new = return_bytes($newlimit);
$cur = @ini_get('memory_limit');
if (empty($cur)) {
// if php is compiled without --enable-memory-limits
// apparently memory_limit is set to ''
$cur=0;
} else {
if ($cur == -1){
return true; // unlimited mem!
}
$cur = return_bytes($cur);
}
$new = return_bytes($newlimit);
if ($new > $cur) {
ini_set('memory_limit', $newlimit);
return true;