From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 includes/ProxyTools.php | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

(limited to 'includes/ProxyTools.php')

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index b54a9a35..bf1c4059 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -84,43 +84,3 @@ function wfIsConfiguredProxy( $ip ) {
 		in_array( $ip, $wgSquidServersNoPurge );
 	return $trusted;
 }
-
-/**
- * Forks processes to scan the originating IP for an open proxy server
- * MemCached can be used to skip IPs that have already been scanned
- */
-function wfProxyCheck() {
-	global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
-	global $wgMemc, $wgProxyMemcExpiry, $wgRequest;
-	global $wgProxyKey;
-
-	if ( !$wgBlockOpenProxies ) {
-		return;
-	}
-
-	$ip = $wgRequest->getIP();
-
-	# Get MemCached key
-	$mcKey = wfMemcKey( 'proxy', 'ip', $ip );
-	$mcValue = $wgMemc->get( $mcKey );
-	$skip = (bool)$mcValue;
-
-	# Fork the processes
-	if ( !$skip ) {
-		$title = SpecialPage::getTitleFor( 'Blockme' );
-		$iphash = md5( $ip . $wgProxyKey );
-		$url = wfExpandUrl( $title->getFullURL( 'ip=' . $iphash ), PROTO_HTTP );
-
-		foreach ( $wgProxyPorts as $port ) {
-			$params = implode( ' ', array(
-						escapeshellarg( $wgProxyScriptPath ),
-						escapeshellarg( $ip ),
-						escapeshellarg( $port ),
-						escapeshellarg( $url )
-						));
-			exec( "php $params >" . wfGetNull() . " 2>&1 &" );
-		}
-		# Set MemCached key
-		$wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );
-	}
-}
-- 
cgit v1.2.3-54-g00ecf