From: Gilles Dubuc Date: Fri, 6 Mar 2015 05:59:18 +0000 (+0100) Subject: Lower timeout of upload stash -> image scaler requests X-Git-Tag: 1.31.0-rc.0~12083^2 X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=d9e7a8c4cebb67ccb6cea85772bdc3600adb2e5d;p=lhc%2Fweb%2Fwiklou.git Lower timeout of upload stash -> image scaler requests This should let us establish if something higher in the chain of requests is timing out too early compared to this internal request. The default of 25 seconds seems unreasonable anyway for a regular web request. Bug: T90599 Change-Id: I06dbf25cd2b1a664ff18682ecbbd73719113d36d --- diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php index 4a92bb9f16..87e70630cf 100644 --- a/includes/specials/SpecialUploadStash.php +++ b/includes/specials/SpecialUploadStash.php @@ -250,7 +250,7 @@ class SpecialUploadStash extends UnlistedSpecialPage { // make a curl call to the scaler to create a thumbnail $httpOptions = array( 'method' => 'GET', - 'timeout' => 'default' + 'timeout' => 5 // T90599 attempt to time out cleanly ); $req = MWHttpRequest::factory( $scalerThumbUrl, $httpOptions, __METHOD__ ); $status = $req->execute();