MDL-24751 simplified use of raise_memory_limit() by introduction of memory use constants, set memory limit before including our large libs, adding support for G suffix introduced in PHP5

This commit is contained in:
Petr Skoda
2010-10-19 09:23:08 +00:00
parent 113072bdd7
commit 0f0f076819
2 changed files with 62 additions and 21 deletions
+3 -3
View File
@@ -337,6 +337,9 @@ $CFG->httpswwwroot = $CFG->wwwroot;
require_once($CFG->libdir .'/setuplib.php'); // Functions that MUST be loaded first
// Increase memory limits if possible
raise_memory_limit(MEMORY_STANDARD);
// Time to start counting
init_performance_info();
@@ -403,9 +406,6 @@ require_once($CFG->libdir .'/messagelib.php'); // Messagelib functions
// make sure PHP is not severly misconfigured
setup_validate_php_configuration();
// Increase memory limits if possible
raise_memory_limit('96M'); // We should never NEED this much but just in case...
// Connect to the database
setup_DB();