From 2f7803c61a9b8996c8c48c20fc615e028426961f Mon Sep 17 00:00:00 2001
From: Erik Moeller <erik@users.mediawiki.org>
Date: Sat, 3 Apr 2004 08:23:25 +0000
Subject: [PATCH] update from live site (proxy_check2.php)

---
 includes/proxy_check.php | 53 +++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/includes/proxy_check.php b/includes/proxy_check.php
index a739e78c06..3660519928 100644
--- a/includes/proxy_check.php
+++ b/includes/proxy_check.php
@@ -4,27 +4,40 @@
 
 # Exit if there are not enough parameters, or if it's not command line mode
 
+$output = "";
 if ( ( isset( $_REQUEST ) && array_key_exists( "argv", $_REQUEST ) ) || count( $argv ) < 4 ) {
-	exit();
-}
+	$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";
 
-# Get parameters
-$ip = $argv[1];
-$port = $argv[2];
-$url = $argv[3];
-
-# Open socket
-$sock = fsockopen($ip, $port, $errno, $errstr, 5);
-if ($errno == 0 ) {
-	# 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, 128);
-	fclose($sock);
+	# 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`;
+
 ?>
-- 
2.20.1