CSteipp has submitted this change and it was merged.
Change subject: Revert "Limit ip-all/subnet-all ping limts per wiki"
......................................................................
Revert "Limit ip-all/subnet-all ping limts per wiki"
This reverts commit 461406e31864e75fcd1c2f5ac967cb7ba5e5a182.
My mistake, we've always used global keys for ip/subnet.
Change-Id: I8bc1bfdf61ae5c0988a913871a7292faed372141
---
M includes/user/User.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/user/User.php b/includes/user/User.php
index 6638fb7..da63075 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1789,14 +1789,14 @@
// ip-based limits
if ( isset( $limits['ip'] ) ) {
$ip = $this->getRequest()->getIP();
- $keys[wfMemcKey( 'limiter', $action, 'ip', $ip
)] = $limits['ip'];
+ $keys["mediawiki:limiter:$action:ip:$ip"] =
$limits['ip'];
}
// subnet-based limits
if ( isset( $limits['subnet'] ) ) {
$ip = $this->getRequest()->getIP();
$subnet = IP::getSubnet( $ip );
if ( $subnet !== false ) {
- $keys[wfMemcKey( 'limiter', $action,
'subnet', $subnet )] = $limits['subnet'];
+
$keys["mediawiki:limiter:$action:subnet:$subnet"] = $limits['subnet'];
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/269470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bc1bfdf61ae5c0988a913871a7292faed372141
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: CSteipp <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
