From: Bartosz Dziewoński Date: Wed, 23 Oct 2013 20:56:50 +0000 (+0200) Subject: Triple default $wgMaxShellMemory (raise to 300 MB) X-Git-Tag: 1.31.0-rc.0~18397^2 X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=45d3656a4c8e169cadc5bda339296cf0aa00556f;p=lhc%2Fweb%2Fwiklou.git Triple default $wgMaxShellMemory (raise to 300 MB) 100 MB is no longer sufficient. That value was chosen back in 2006 (r14795); the world has largely moved on to 64-bit programs since then, and applications such as ImageMagick seem to use 16-bit precision for each image channel. It's not enough to scale regular large-ish images on default system settings anymore. Bug: 34241 Change-Id: I66bbe12925689f9273f3b5fb29adc8c15c828c70 --- diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index 091a04aabf..00026bcfea 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -64,6 +64,7 @@ production. * (bug 54597) $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath, and $wgProxyMemcExpiry have been removed, along with the open proxy scanner script they were added for. +* Default value of $wgMaxShellMemory has been tripled (it's now 300 MB). === New features in 1.22 === * (bug 44525) mediawiki.jqueryMsg can now parse (whitelisted) HTML elements and attributes. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 8215bd8d77..dbdd89e52e 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -6629,7 +6629,7 @@ $wgCrossSiteAJAXdomainExceptions = array(); /** * Maximum amount of virtual memory available to shell processes under linux, in KB. */ -$wgMaxShellMemory = 102400; +$wgMaxShellMemory = 307200; /** * Maximum file size created by shell processes under linux, in KB