update from live site (proxy_check2.php)

diff --git a/includes/proxy_check.php b/includes/proxy_check.php
index a739e78..3660519 100644 (file)
--- 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`;
+
 ?>