Merge "Improve some timeout docs"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d07136b..5d95964 100644 (file)
--- 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 88cc510..0f0118c 100644 (file)
--- 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;