From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 9 Jan 2013 00:08:51 +0000 (-0800)
Subject: Set timeout for AssembleUploadChunks.php.
X-Git-Tag: 1.31.0-rc.0~21101^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=a66445acc06bf336cf8a50e275bb36de99f08ef9;p=lhc%2Fweb%2Fwiklou.git

Set timeout for AssembleUploadChunks.php.

* This change was placed in the wrong commit instead.

Change-Id: I2de6bf1e3a3101b4fa733b8cc0911ac77b38e921
---

diff --git a/includes/upload/AssembleUploadChunks.php b/includes/upload/AssembleUploadChunks.php
index d933d34d47..54ef840055 100644
--- a/includes/upload/AssembleUploadChunks.php
+++ b/includes/upload/AssembleUploadChunks.php
@@ -21,6 +21,7 @@
  * @ingroup Maintenance
  */
 require_once( __DIR__ . '/../../maintenance/Maintenance.php' );
+set_time_limit( 3600 ); // 1 hour
 
 /**
  * Assemble the segments of a chunked upload.