From 8410427778275a4c879cfcd307ef8b5ab8a5a187 Mon Sep 17 00:00:00 2001 From: Reedy Date: Thu, 2 Aug 2012 23:17:50 +0100 Subject: [PATCH] * (bug 38953) --memory-limit switch not working for runJobs.php. In runJobs.php the memory limit was hardcoded to 150M, so passing --memory-limit would have no difference. Changed to using what was passed as --memory-limit if something was, else just use the 150M as usual Change-Id: I3e3bafc6a0fe4e88792a65f01b432c8f4f6677cf --- RELEASE-NOTES-1.20 | 1 + maintenance/runJobs.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index 9e17daf12a..3a14f55c54 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -188,6 +188,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki. * (bug 25095) Special:Categories should also include the first relevant item when "from" is filled. * (bug 35526) jquery.tablesorter now uses a stable sort. +* (bug 38953) --memory-limit switch not working for runJobs.php. === API changes in 1.20 === * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API. diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index 946ee2b990..fdc141bb3b 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -37,6 +37,9 @@ class RunJobs extends Maintenance { } public function memoryLimit() { + if ( $this->hasOption( 'memory-limit' ) ) { + return parent::memoryLimit(); + } // Don't eat all memory on the machine if we get a bad job. return "150M"; } -- 2.20.1