Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373856 )
Change subject: Improve some timeout docs
......................................................................
Improve some timeout docs
Change-Id: I799ea1e647d4d67a3c7d0e8dfddff893aef32736
---
M includes/DefaultSettings.php
M includes/http/MWHttpRequest.php
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/56/373856/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 610df45..1f3b5e3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -755,6 +755,8 @@
* timeout longer than the default $wgHTTPTimeout. False means fallback
* to default.
*
+ * @var int|bool
+ *
* @since 1.22
*/
$wgCopyUploadTimeout = false;
@@ -8279,6 +8281,7 @@
/**
* 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
--- a/includes/http/MWHttpRequest.php
+++ b/includes/http/MWHttpRequest.php
@@ -33,8 +33,12 @@
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;
--
To view, visit https://gerrit.wikimedia.org/r/373856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I799ea1e647d4d67a3c7d0e8dfddff893aef32736
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
