From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 7 Jan 2013 23:19:20 +0000 (-0800)
Subject: Enforce time limit within AssembleUploadChunks.php.
X-Git-Tag: 1.31.0-rc.0~21112
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=e9e11251b788a70a3d30ffc9e1273f5a4b66c4b3;p=lhc%2Fweb%2Fwiklou.git

Enforce time limit within AssembleUploadChunks.php.

Change-Id: I8cfcb09da8e7e9020e6b5dfbc5e727522d01b7c1
---

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 377bfbfe76..cfa1683173 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -226,7 +226,9 @@ class ApiUpload extends ApiBase {
 							'--quiet'
 						)
 					) . " < " . wfGetNull() . " > " . wfGetNull() . " 2>&1 &";
-					wfShellExec( $cmd, $retVal ); // start a process in the background
+					// Start a process in the background. Enforce the time limits via PHP
+					// since ulimit4.sh seems to often not work for this particular usage.
+					wfShellExec( $cmd, $retVal, array(), array( 'time' => 0, 'memory' => 0 ) );
 					if ( $retVal == 0 ) {
 						$result['result'] = 'Poll';
 					} else {