Wordpress 2.9-scripts

[autoinstalls/wordpress.git] / wp-includes / class-snoopy.php

diff --git a/wp-includes/class-snoopy.php b/wp-includes/class-snoopy.php
index 9e60206d62b271495cd91ed130434ea6431092f7..b1b32d2faa9bbd82e8da6a7c161257de6864f02f 100644 (file)
--- a/wp-includes/class-snoopy.php
+++ b/wp-includes/class-snoopy.php
@@ -1,11 +1,11 @@
 <?php
-
+if ( !in_array('Snoopy', get_declared_classes() ) ) :
 /*************************************************
 
 Snoopy - the PHP net client
 Author: Monte Ohrt <monte@ispi.net>
-Copyright (c): 1999-2000 ispi, all rights reserved
-Version: 1.01
+Copyright (c): 1999-2008 New Digital Group, all rights reserved
+Version: 1.2.4
 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,20 +22,13 @@ Version: 1.01
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 You may contact the author of Snoopy by e-mail at:
-monte@ispi.net
-
-Or, write to:
-Monte Ohrt
-CTO, ispi
-237 S. 70th suite 220
-Lincoln, NE 68510
+monte@ohrt.com
 
 The latest version of Snoopy can be obtained from:
 http://snoopy.sourceforge.net/
 
 *************************************************/
 
-if ( !in_array('Snoopy', get_declared_classes() ) ) :
 class Snoopy
 {
        /**** Public variables ****/
@@ -49,7 +42,7 @@ class Snoopy
        var $proxy_user         =       "";                                     // proxy user to use
        var $proxy_pass         =       "";                                     // proxy password to use
 
-       var $agent                      =       "Snoopy v1.2.3";        // agent we masquerade as
+       var $agent                      =       "Snoopy v1.2.4";        // agent we masquerade as
        var     $referer                =       "";                                     // referer info to pass
        var $cookies            =       array();                        // array of cookies to pass
                                                                                                // $cookies["username"]="joe";
@@ -78,7 +71,7 @@ class Snoopy
        var $error                      =       "";                                     // error messages sent here
        var     $response_code  =       "";                                     // response code returned from server
        var     $headers                =       array();                        // headers returned from server sent here
-       var     $maxlength              =       8192;                           // max return data length (body)
+       var     $maxlength              =       500000;                         // max return data length (body)
        var $read_timeout       =       0;                                      // timeout on read operations, in seconds
                                                                                                // supported only since PHP 4 Beta 4
                                                                                                // set to 0 to disallow timeouts
@@ -720,13 +713,13 @@ class Snoopy
                                                        chr(176),
                                                        chr(39),
                                                        chr(128),
-                                                       "ä",
-                                                       "ö",
-                                                       "ü",
-                                                       "Ä",
-                                                       "Ö",
-                                                       "Ü",
-                                                       "ß",
+                                                       "ä",
+                                                       "ö",
+                                                       "ü",
+                                                       "Ä",
+                                                       "Ö",
+                                                       "Ü",
+                                                       "ß",
                                                );
 
                $text = preg_replace($search,$replace,$document);
@@ -1013,8 +1006,7 @@ class Snoopy
 
                $headerfile = tempnam($temp_dir, "sno");
 
-               $safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access
-               exec(escapeshellcmd($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\""),$results,$return);
+               exec($this->curl_path." -k -D \"$headerfile\"".$cmdline_params." \"".escapeshellcmd($URI)."\"",$results,$return);
 
                if($return)
                {
@@ -1238,9 +1230,7 @@ class Snoopy
                                                if (!is_readable($file_name)) continue;
 
                                                $fp = fopen($file_name, "r");
-                                               while (!feof($fp)) {
-                                                       $file_content .= fread($fp, filesize($file_name));
-                                               }
+                                               $file_content = fread($fp, filesize($file_name));
                                                fclose($fp);
                                                $base_name = basename($file_name);
 
@@ -1257,5 +1247,4 @@ class Snoopy
        }
 }
 endif;
-
 ?>