From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 25 Aug 2017 19:56:48 +0000 (+0000)
Subject: Merge "Improve some timeout docs"
X-Git-Tag: 1.31.0-rc.0~2298
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=985f425a8016767b032c2335d25e2c4c636c9e27;hp=8be3601afbedecc2b6a766e50c53c5cd6440e43b;p=lhc%2Fweb%2Fwiklou.git

Merge "Improve some timeout docs"
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d07136baca..5d95964e93 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -755,6 +755,8 @@ $wgCopyUploadProxy = false;
  * timeout longer than the default $wgHTTPTimeout. False means fallback
  * to default.
  *
+ * @var int|bool
+ *
  * @since 1.22
  */
 $wgCopyUploadTimeout = false;
@@ -8271,6 +8273,7 @@ $wgShellLocale = 'C.UTF-8';
 
 /**
  * Timeout for HTTP requests done internally, in seconds.
+ * @var int
  */
 $wgHTTPTimeout = 25;
 
diff --git a/includes/http/MWHttpRequest.php b/includes/http/MWHttpRequest.php
index 88cc510219..0f0118ce00 100644
--- a/includes/http/MWHttpRequest.php
+++ b/includes/http/MWHttpRequest.php
@@ -33,8 +33,12 @@ use Psr\Log\NullLogger;
 class MWHttpRequest implements LoggerAwareInterface {
 	const SUPPORTS_FILE_POSTS = false;
 
-	protected $content;
+	/**
+	 * @var int|string
+	 */
 	protected $timeout = 'default';
+
+	protected $content;
 	protected $headersOnly = null;
 	protected $postData = null;
 	protected $proxy = null;