Lower timeout of upload stash -> image scaler requests
authorGilles Dubuc <gdubuc@wikimedia.org>
Fri, 6 Mar 2015 05:59:18 +0000 (06:59 +0100)
committerGilles Dubuc <gdubuc@wikimedia.org>
Fri, 6 Mar 2015 05:59:18 +0000 (06:59 +0100)
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

includes/specials/SpecialUploadStash.php

index 4a92bb9..87e7063 100644 (file)
@@ -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();