From: Reedy <reedy@wikimedia.org>
Date: Thu, 2 Aug 2012 22:17:50 +0000 (+0100)
Subject: * (bug 38953) --memory-limit switch not working for runJobs.php.
X-Git-Tag: 1.31.0-rc.0~22866
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=8410427778275a4c879cfcd307ef8b5ab8a5a187;p=lhc%2Fweb%2Fwiklou.git

* (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
---

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";
 	}