dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61d82df
)
Set memory limit in finalSetup() to override what might have been set elsewhere
author
Brion Vibber
<brion@users.mediawiki.org>
Thu, 24 Sep 2009 23:03:23 +0000
(23:03 +0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Thu, 24 Sep 2009 23:03:23 +0000
(23:03 +0000)
maintenance/Maintenance.php
patch
|
blob
|
history
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
27da73e
..
bcd2913
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-337,6
+337,7
@@
abstract class Maintenance {
}
# Set the memory limit
+ # Note we need to set it again later in cache LocalSettings changed it
ini_set( 'memory_limit', $this->memoryLimit() );
# Set max execution time to 0 (no limit). PHP.net says that
@@
-594,6
+595,7
@@
abstract class Maintenance {
$wgShowSQLErrors = true;
@set_time_limit( 0 );
+ ini_set( 'memory_limit', $this->memoryLimit() );
$wgProfiling = false; // only for Profiler.php mode; avoids OOM errors
}