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:
78704bd
)
(bug 16084) Default memory limit should be increased
author
Aaron Schulz
<aaron@users.mediawiki.org>
Sat, 3 Jan 2009 06:00:30 +0000
(06:00 +0000)
committer
Aaron Schulz
<aaron@users.mediawiki.org>
Sat, 3 Jan 2009 06:00:30 +0000
(06:00 +0000)
config/index.php
patch
|
blob
|
history
diff --git
a/config/index.php
b/config/index.php
index
2810561
..
4159c69
100644
(file)
--- a/
config/index.php
+++ b/
config/index.php
@@
-461,8
+461,8
@@
if( empty( $memlimit ) || $memlimit == -1 ) {
$n = intval( $m[1] * (1024*1024) );
}
if( $n < 20*1024*1024 ) {
$n = intval( $m[1] * (1024*1024) );
}
if( $n < 20*1024*1024 ) {
- print "Attempting to raise limit to
2
0M... ";
- if( false === ini_set( "memory_limit", "
2
0M" ) ) {
+ print "Attempting to raise limit to
5
0M... ";
+ if( false === ini_set( "memory_limit", "
5
0M" ) ) {
print "failed.<br /><b>" . htmlspecialchars( $memlimit ) . " seems too low, installation may fail!</b>";
} else {
$conf->raiseMemory = true;
print "failed.<br /><b>" . htmlspecialchars( $memlimit ) . " seems too low, installation may fail!</b>";
} else {
$conf->raiseMemory = true;
@@
-1661,7
+1661,7
@@
set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_inclu
require_once( \"\$IP/includes/DefaultSettings.php\" );
# If PHP's memory limit is very low, some operations may fail.
require_once( \"\$IP/includes/DefaultSettings.php\" );
# If PHP's memory limit is very low, some operations may fail.
-" . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '
2
0M' );" . "
+" . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '
5
0M' );" . "
if ( \$wgCommandLineMode ) {
if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {
if ( \$wgCommandLineMode ) {
if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {