jenkins-bot has submitted this change and it was merged.
Change subject: Update Http::get() calling signature
......................................................................
Update Http::get() calling signature
Parameter 2 isn't the timeout anymore, and set $caller
'timeout' => 'default' gets set deeper, so no need to still pass
it as an option
Change-Id: I0f296a6371895f911f3577bf9978f088d76c5890
---
M includes/TorExitNodes.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TorExitNodes.php b/includes/TorExitNodes.php
index c9b41bf..e7a78f2 100644
--- a/includes/TorExitNodes.php
+++ b/includes/TorExitNodes.php
@@ -139,7 +139,7 @@
$nodes = array();
foreach ( $wgTorIPs as $ip ) {
$url =
'https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=' . $ip;
- $data = Http::get( $url, 'default', $options );
+ $data = Http::get( $url, $options, __METHOD__ );
$lines = explode("\n", $data);
foreach ( $lines as $line ) {
@@ -167,7 +167,7 @@
if ( $wgTorBlockProxy ) {
$options['proxy'] = $wgTorBlockProxy;
}
- $raw = Http::get( $url, 'default', $options );
+ $raw = Http::get( $url, $options, __METHOD__ );
$data = FormatJson::decode( $raw, true );
if ( !isset( $data['relays'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/300525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f296a6371895f911f3577bf9978f088d76c5890
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TorBlock
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
