From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 25 Apr 2011 21:04:45 +0000 (+0000)
Subject: proxy_check.php is probably useful to keep around, but it's not really an includes... 
X-Git-Tag: 1.31.0-rc.0~30558
X-Git-Url: http://git.cyclocoop.org//%27http:/ie7-js.googlecode.com/svn/test/index.html/%27?a=commitdiff_plain;h=20788326f49dce73228b6bda48277b54ddbe9f69;p=lhc%2Fweb%2Fwiklou.git

proxy_check.php is probably useful to keep around, but it's not really an includes script

Move it to maintenance/proxy_check.php
---

diff --git a/includes/proxy_check.php b/includes/proxy_check.php
deleted file mode 100644
index 2bc46c0d21..0000000000
--- a/includes/proxy_check.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Command line script to check for an open proxy at a specified location
- *
- * @file
- */
-
-if( php_sapi_name() != 'cli' ) {
-	die( 1 );
-}
-
-/**
- *
- */
-$output = '';
-
-/**
- * Exit if there are not enough parameters, or if it's not command line mode
- */
-if ( ( isset( $_REQUEST ) && array_key_exists( 'argv', $_REQUEST ) ) || count( $argv ) < 4 ) {
-	$output .= "Incorrect parameters\n";
-} else {
-	/**
-	 * Get parameters
-	 */
-	$ip = $argv[1];
-	$port = $argv[2];
-	$url = $argv[3];
-	$host = trim(`hostname`);
-	$output = "Connecting to $ip:$port, target $url, this hostname $host\n";
-
-	# Open socket
-	$sock = @fsockopen($ip, $port, $errno, $errstr, 5);
-	if ($errno == 0 ) {
-		$output .= "Connected\n";
-		# Send payload
-		$request = "GET $url HTTP/1.0\r\n";
-#		$request .= "Proxy-Connection: Keep-Alive\r\n";
-#		$request .= "Pragma: no-cache\r\n";
-#		$request .= "Host: ".$url."\r\n";
-#		$request .= "User-Agent: MediaWiki open proxy check\r\n";
-		$request .= "\r\n";
-		@fputs($sock, $request);
-		$response = fgets($sock, 65536);
-		$output .= $response;
-		@fclose($sock);
-	} else {
-		$output .= "No connection\n";
-	}
-}
-
-$output = escapeshellarg( $output );
-
-#`echo $output >> /home/tstarling/open/proxy.log`;
diff --git a/maintenance/proxy_check.php b/maintenance/proxy_check.php
new file mode 100644
index 0000000000..2bc46c0d21
--- /dev/null
+++ b/maintenance/proxy_check.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Command line script to check for an open proxy at a specified location
+ *
+ * @file
+ */
+
+if( php_sapi_name() != 'cli' ) {
+	die( 1 );
+}
+
+/**
+ *
+ */
+$output = '';
+
+/**
+ * Exit if there are not enough parameters, or if it's not command line mode
+ */
+if ( ( isset( $_REQUEST ) && array_key_exists( 'argv', $_REQUEST ) ) || count( $argv ) < 4 ) {
+	$output .= "Incorrect parameters\n";
+} else {
+	/**
+	 * Get parameters
+	 */
+	$ip = $argv[1];
+	$port = $argv[2];
+	$url = $argv[3];
+	$host = trim(`hostname`);
+	$output = "Connecting to $ip:$port, target $url, this hostname $host\n";
+
+	# Open socket
+	$sock = @fsockopen($ip, $port, $errno, $errstr, 5);
+	if ($errno == 0 ) {
+		$output .= "Connected\n";
+		# Send payload
+		$request = "GET $url HTTP/1.0\r\n";
+#		$request .= "Proxy-Connection: Keep-Alive\r\n";
+#		$request .= "Pragma: no-cache\r\n";
+#		$request .= "Host: ".$url."\r\n";
+#		$request .= "User-Agent: MediaWiki open proxy check\r\n";
+		$request .= "\r\n";
+		@fputs($sock, $request);
+		$response = fgets($sock, 65536);
+		$output .= $response;
+		@fclose($sock);
+	} else {
+		$output .= "No connection\n";
+	}
+}
+
+$output = escapeshellarg( $output );
+
+#`echo $output >> /home/tstarling/open/proxy.log`;