Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119883
Change subject: Fix Tor exit node IP address fetching
......................................................................
Fix Tor exit node IP address fetching
Bug: 62894
Change-Id: Ic51cd6769bae0a3290a30211621b55f67ed96940
---
M TorExitNodes.php
M loadExitNodes.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TorBlock
refs/changes/83/119883/1
diff --git a/TorExitNodes.php b/TorExitNodes.php
index f26711c..4cfd4d3 100644
--- a/TorExitNodes.php
+++ b/TorExitNodes.php
@@ -184,7 +184,7 @@
foreach ( $data['relays'] as $relay ) {
$addresses = $relay['or_addresses'];
if ( isset( $relay['exit_addresses'] ) ) {
- $addresses += $relay['exit_addresses'];
+ $addresses = array_merge( $addresses,
$relay['exit_addresses'] );
}
foreach ( $addresses as $ip ) {
diff --git a/loadExitNodes.php b/loadExitNodes.php
index 98d8893..959eb96 100644
--- a/loadExitNodes.php
+++ b/loadExitNodes.php
@@ -47,7 +47,7 @@
if ( !$nodes ) {
$this->error( "Could not load exit nodes.", true );
}
- $this->output( "Successfully loaded exit nodes.\n" );
+ $this->output( 'Successfully loaded ' . count( $nodes ) . "
exit nodes.\n" );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/119883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic51cd6769bae0a3290a30211621b55f67ed96940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TorBlock
Gerrit-Branch: master
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
