From: addshore <addshorewiki@gmail.com>
Date: Fri, 25 Aug 2017 10:02:04 +0000 (+0300)
Subject: Improve some timeout docs
X-Git-Tag: 1.31.0-rc.0~2298^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=2f72285267eee749dfe0389deccb60a9bfe88bff;p=lhc%2Fweb%2Fwiklou.git

Improve some timeout docs

Change-Id: I799ea1e647d4d67a3c7d0e8dfddff893aef32736
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 610df45ae7..1f3b5e3e2f 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;
@@ -8279,6 +8281,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;