From 30c396f09abf9faa11ccda8ceebe7a1d3104336c Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Tue, 19 Oct 2010 09:41:35 +0000 Subject: [PATCH] MDL-24751 increased default memory limit when deciding to use apache_child_terminate, we can safely remove all other uses --- lib/moodlelib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index f6eca669f9a..f9b81a47a85 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -8850,8 +8850,7 @@ function fullclone($thing) { * Right now we do it only if we are under apache, to * make sure apache children that hog too much mem are * killed. - * - * @global object + * @return void */ function moodle_request_shutdown() { global $CFG; @@ -8862,7 +8861,7 @@ function moodle_request_shutdown() { && function_exists('memory_get_usage') && ini_get_bool('child_terminate')) { if (empty($CFG->apachemaxmem)) { - $CFG->apachemaxmem = 25000000; // default 25MiB + $CFG->apachemaxmem = 64*1024; // default 64MB } if (memory_get_usage() > (int)$CFG->apachemaxmem) { trigger_error('Mem usage over $CFG->apachemaxmem: marking child for reaping.'); -- 2.17.1