"MEMORY/MDL-18540,remove hard-coded php memory limit, added system setting for it, create a function reduce_memory_limit to reduce memroy limit and respect php.ini setting in the meanwhile"

2009-03-26 01:43:08 +00:00
parent 307b92632b
commit 28d02ef39e
1 changed files with 6 additions and 2 deletions
@@ -363,7 +363,11 @@ class problem_000008 extends problem_base {
        }
        $oldmemlimit = get_real_size($oldmemlimit);
        //now lets change the memory limit to something unique below 128M==134217728
-        @ini_set('memory_limit', 134217720);
+        if (empty($CFG->memorylimit)) {
+            raise_memory_limit('128M');
+        } else {
+            raise_memory_limit($CFG->memorylimit);
+        }
        $testmemlimit = get_real_size(@ini_get('memory_limit'));
        //verify the change had any effect at all
        if ($oldmemlimit == $testmemlimit) {
@@ -374,7 +378,7 @@ class problem_000008 extends problem_base {
                return false;
            }
        }
-        @ini_set('memory_limit', $oldmemlimit);
+        reduce_memory_limit($oldmemlimit);
        return false;
    }
    function severity() {