Mark Bergsma has submitted this change and it was merged.
Change subject: Revert "Whitelist our IPv6 range"
......................................................................
Revert "Whitelist our IPv6 range"
This reverts commit f5a217d890fee20d980c6f1894234ddc4e4b733c.
Change-Id: Ie8f2ee7bc42b2bc4a5bf04f8973b0628d1886ebe
---
M wmf-config/squid.php
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/squid.php b/wmf-config/squid.php
index b7babba..b8b8bcf 100644
--- a/wmf-config/squid.php
+++ b/wmf-config/squid.php
@@ -240,12 +240,3 @@
'62.214.230.86',
'217.94.171.96',
);
-
-# Because the above variables don't support subnets, we'll have to do this the
hard way
-$wgHooks['IsTrustedProxy'][] = function( &$ip, &$trusted ) {
- # No need to do a full IPv6 validation here
- if ( !$trusted && strpos( $ip, ':' ) ) {
- $trusted = IP::isInRange( $ip, '2620:0:860::/46' );
- }
- return true;
-};
--
To view, visit https://gerrit.wikimedia.org/r/76491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8f2ee7bc42b2bc4a5bf04f8973b0628d1886ebe
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
