Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Snoopy 1.2.4

git-svn-id: http://svn.automattic.com/wordpress/branches/2.6@9304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
commit 913d49b1bdf43ac7662af19578c9762b47e5a0f4 1 parent eb1eaa9
ryan authored
Showing with 163 additions and 181 deletions.
  1. +163 −181 wp-includes/class-snoopy.php
View
344 wp-includes/class-snoopy.php
@@ -1,22 +1,12 @@
<?php
-/**
- * Snoopy - the PHP net client
- * @author Monte Ohrt <monte@ispi.net>
- * @copyright 1999-2000 ispi, all rights reserved
- * @version 1.01
- * @license GNU Lesser GPL
- * @link http://snoopy.sourceforge.net/
- * @package Snoopy
- */
-
-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
- *
+
+/*************************************************
+
+Snoopy - the PHP net client
+Author: Monte Ohrt <monte@ispi.net>
+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
* License as published by the Free Software Foundation; either
@@ -30,23 +20,19 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* 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
- *
- * @link http://snoopy.sourceforge.net/ The latest version of Snoopy can be
- * obtained
- */
+
+You may contact the author of Snoopy by e-mail at:
+monte@ohrt.com
+
+The latest version of Snoopy can be obtained from:
+http://snoopy.sourceforge.net/
+
+*************************************************/
+
class Snoopy
{
/**** Public variables ****/
-
+
/* user definable vars */
var $host = "www.php.net"; // host name we are connecting to
@@ -55,8 +41,8 @@ class Snoopy
var $proxy_port = ""; // proxy port to use
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";
@@ -73,19 +59,19 @@ class Snoopy
var $passcookies = true; // pass set cookies back through redirects
// NOTE: this currently does not respect
// dates, domains or paths.
-
+
var $user = ""; // user for http authentication
var $pass = ""; // password for http authentication
-
+
// http accept types
var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-
+
var $results = ""; // where the content is put
-
+
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
@@ -107,11 +93,11 @@ class Snoopy
// library functions built into php,
// as these functions are not stable
// as of this Snoopy release.
-
- /**** Private variables ****/
-
+
+ /**** Private variables ****/
+
var $_maxlinelen = 4096; // max line length (headers)
-
+
var $_httpmethod = "GET"; // default http request method
var $_httpversion = "HTTP/1.0"; // default http request version
var $_submit_method = "POST"; // default submit method
@@ -121,7 +107,7 @@ class Snoopy
var $_redirectdepth = 0; // increments on an http redirect
var $_frameurls = array(); // frame src urls
var $_framedepth = 0; // increments on frame depth
-
+
var $_isproxy = false; // set if using a proxy server
var $_fp_timeout = 30; // timeout for socket connection
@@ -136,7 +122,7 @@ class Snoopy
function fetch($URI)
{
-
+
//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
$URI_PARTS = parse_url($URI);
if (!empty($URI_PARTS["user"]))
@@ -147,7 +133,7 @@ function fetch($URI)
$URI_PARTS["query"] = '';
if (empty($URI_PARTS["path"]))
$URI_PARTS["path"] = '';
-
+
switch(strtolower($URI_PARTS["scheme"]))
{
case "http":
@@ -167,7 +153,7 @@ function fetch($URI)
// no proxy, send only the path
$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
}
-
+
$this->_disconnect($fp);
if($this->_redirectaddr)
@@ -190,7 +176,7 @@ function fetch($URI)
{
$frameurls = $this->_frameurls;
$this->_frameurls = array();
-
+
while(list(,$frameurl) = each($frameurls))
{
if($this->_framedepth < $this->maxframes)
@@ -201,13 +187,13 @@ function fetch($URI)
else
break;
}
- }
+ }
}
else
{
return false;
}
- return true;
+ return true;
break;
case "https":
if(!$this->curl_path)
@@ -261,15 +247,15 @@ function fetch($URI)
else
break;
}
- }
- return true;
+ }
+ return true;
break;
default:
// not a valid protocol
$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
return false;
break;
- }
+ }
return true;
}
@@ -287,9 +273,9 @@ function fetch($URI)
function submit($URI, $formvars="", $formfiles="")
{
unset($postdata);
-
+
$postdata = $this->_prepare_post_body($formvars, $formfiles);
-
+
$URI_PARTS = parse_url($URI);
if (!empty($URI_PARTS["user"]))
$this->user = $URI_PARTS["user"];
@@ -319,17 +305,17 @@ function submit($URI, $formvars="", $formfiles="")
// no proxy, send only the path
$this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
}
-
+
$this->_disconnect($fp);
if($this->_redirectaddr)
{
/* url was redirected, check if we've hit the max depth */
if($this->maxredirs > $this->_redirectdepth)
- {
+ {
if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
- $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
-
+ $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+
// only follow redirect if it's on this site, or offsiteok is true
if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
{
@@ -348,9 +334,9 @@ function submit($URI, $formvars="", $formfiles="")
{
$frameurls = $this->_frameurls;
$this->_frameurls = array();
-
+
while(list(,$frameurl) = each($frameurls))
- {
+ {
if($this->_framedepth < $this->maxframes)
{
$this->fetch($frameurl);
@@ -359,14 +345,14 @@ function submit($URI, $formvars="", $formfiles="")
else
break;
}
- }
-
+ }
+
}
else
{
return false;
}
- return true;
+ return true;
break;
case "https":
if(!$this->curl_path)
@@ -393,9 +379,9 @@ function submit($URI, $formvars="", $formfiles="")
{
/* url was redirected, check if we've hit the max depth */
if($this->maxredirs > $this->_redirectdepth)
- {
+ {
if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
- $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+ $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
// only follow redirect if it's on this site, or offsiteok is true
if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
@@ -417,7 +403,7 @@ function submit($URI, $formvars="", $formfiles="")
$this->_frameurls = array();
while(list(,$frameurl) = each($frameurls))
- {
+ {
if($this->_framedepth < $this->maxframes)
{
$this->fetch($frameurl);
@@ -426,16 +412,16 @@ function submit($URI, $formvars="", $formfiles="")
else
break;
}
- }
- return true;
+ }
+ return true;
break;
-
+
default:
// not a valid protocol
$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
return false;
break;
- }
+ }
return true;
}
@@ -449,7 +435,7 @@ function submit($URI, $formvars="", $formfiles="")
function fetchlinks($URI)
{
if ($this->fetch($URI))
- {
+ {
if($this->lastredirectaddr)
$URI = $this->lastredirectaddr;
if(is_array($this->results))
@@ -477,9 +463,9 @@ function fetchlinks($URI)
function fetchform($URI)
{
-
+
if ($this->fetch($URI))
- {
+ {
if(is_array($this->results))
{
@@ -488,14 +474,14 @@ function fetchform($URI)
}
else
$this->results = $this->_stripform($this->results);
-
+
return true;
}
else
return false;
}
-
-
+
+
/*======================================================================*\
Function: fetchtext
Purpose: fetch the text from a web page, stripping the links
@@ -506,7 +492,7 @@ function fetchform($URI)
function fetchtext($URI)
{
if($this->fetch($URI))
- {
+ {
if(is_array($this->results))
{
for($x=0;$x<count($this->results);$x++)
@@ -530,7 +516,7 @@ function fetchtext($URI)
function submitlinks($URI, $formvars="", $formfiles="")
{
if($this->submit($URI,$formvars, $formfiles))
- {
+ {
if($this->lastredirectaddr)
$URI = $this->lastredirectaddr;
if(is_array($this->results))
@@ -564,7 +550,7 @@ function submitlinks($URI, $formvars="", $formfiles="")
function submittext($URI, $formvars = "", $formfiles = "")
{
if($this->submit($URI,$formvars, $formfiles))
- {
+ {
if($this->lastredirectaddr)
$URI = $this->lastredirectaddr;
if(is_array($this->results))
@@ -588,7 +574,7 @@ function submittext($URI, $formvars = "", $formfiles = "")
return false;
}
-
+
/*======================================================================*\
Function: set_submit_multipart
@@ -600,7 +586,7 @@ function set_submit_multipart()
$this->_submit_type = "multipart/form-data";
}
-
+
/*======================================================================*\
Function: set_submit_normal
Purpose: Set the form submission content type to
@@ -611,14 +597,14 @@ function set_submit_normal()
$this->_submit_type = "application/x-www-form-urlencoded";
}
-
-
+
+
/*======================================================================*\
Private functions
\*======================================================================*/
-
-
+
+
/*======================================================================*\
Function: _striplinks
Purpose: strip the hyperlinks from an html document
@@ -627,13 +613,13 @@ function set_submit_normal()
\*======================================================================*/
function _striplinks($document)
- {
+ {
preg_match_all("'<\s*a\s.*?href\s*=\s* # find <a href=
([\"\'])? # find single or double quote
(?(1) (.*?)\\1 | ([^\s\>]+)) # if quote found, match up to next matching
# quote, otherwise match up to next space
'isx",$document,$links);
-
+
// catenate the non-empty matches from the conditional subpattern
@@ -641,14 +627,14 @@ function _striplinks($document)
{
if(!empty($val))
$match[] = $val;
- }
-
+ }
+
while(list($key,$val) = each($links[3]))
{
if(!empty($val))
$match[] = $val;
- }
-
+ }
+
// return the links
return $match;
}
@@ -661,18 +647,18 @@ function _striplinks($document)
\*======================================================================*/
function _stripform($document)
- {
+ {
preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
-
+
// catenate the matches
$match = implode("\r\n",$elements[0]);
-
+
// return the links
return $match;
}
-
-
+
+
/*======================================================================*\
Function: _striptext
Purpose: strip the text from an html document
@@ -682,11 +668,11 @@ function _stripform($document)
function _striptext($document)
{
-
+
// I didn't use preg eval (//e) since that is only available in PHP 4.0.
// so, list your entities one by one here. I included some of the
// more common ones.
-
+
$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
"'([\r\n])[\s]+'", // strip out white space
@@ -727,17 +713,17 @@ function _striptext($document)
chr(176),
chr(39),
chr(128),
- "ä",
- "ö",
- "ü",
- "Ä",
- "Ö",
- "Ü",
- "ß",
+ "ä",
+ "ö",
+ "ü",
+ "Ä",
+ "Ö",
+ "Ü",
+ "ß",
);
-
+
$text = preg_replace($search,$replace,$document);
-
+
return $text;
}
@@ -751,7 +737,7 @@ function _striptext($document)
function _expandlinks($links,$URI)
{
-
+
preg_match("/^[^\?]+/",$URI,$match);
$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
@@ -759,21 +745,21 @@ function _expandlinks($links,$URI)
$match_part = parse_url($match);
$match_root =
$match_part["scheme"]."://".$match_part["host"];
-
+
$search = array( "|^http://".preg_quote($this->host)."|i",
"|^(\/)|i",
"|^(?!http://)(?!mailto:)|i",
"|/\./|",
"|/[^\/]+/\.\./|"
);
-
+
$replace = array( "",
$match_root."/",
$match."/",
"/",
"/"
- );
-
+ );
+
$expandedLinks = preg_replace($search,$replace,$links);
return $expandedLinks;
@@ -786,24 +772,24 @@ function _expandlinks($links,$URI)
$fp the current open file pointer
$URI the full URI
$body body contents to send if any (POST)
- Output:
+ Output:
\*======================================================================*/
-
+
function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
{
$cookie_headers = '';
if($this->passcookies && $this->_redirectaddr)
$this->setcookies();
-
+
$URI_PARTS = parse_url($URI);
if(empty($url))
$url = "/";
- $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
+ $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
if(!empty($this->agent))
$headers .= "User-Agent: ".$this->agent."\r\n";
if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
$headers .= "Host: ".$this->host;
- if(!empty($this->port) && $this->port != 80)
+ if(!empty($this->port))
$headers .= ":".$this->port;
$headers .= "\r\n";
}
@@ -812,10 +798,10 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
if(!empty($this->referer))
$headers .= "Referer: ".$this->referer."\r\n";
if(!empty($this->cookies))
- {
+ {
if(!is_array($this->cookies))
$this->cookies = (array)$this->cookies;
-
+
reset($this->cookies);
if ( count($this->cookies) > 0 ) {
$cookie_headers .= 'Cookie: ';
@@ -823,7 +809,7 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
}
$headers .= substr($cookie_headers,0,-2) . "\r\n";
- }
+ }
}
if(!empty($this->rawheaders))
{
@@ -838,28 +824,28 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
$headers .= "; boundary=".$this->_mime_boundary;
$headers .= "\r\n";
}
- if(!empty($body))
+ if(!empty($body))
$headers .= "Content-length: ".strlen($body)."\r\n";
- if(!empty($this->user) || !empty($this->pass))
+ if(!empty($this->user) || !empty($this->pass))
$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
-
+
//add proxy auth headers
- if(!empty($this->proxy_user))
+ if(!empty($this->proxy_user))
$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
$headers .= "\r\n";
-
+
// set the read timeout if needed
if ($this->read_timeout > 0)
socket_set_timeout($fp, $this->read_timeout);
$this->timed_out = false;
-
+
fwrite($fp,$headers.$body,strlen($headers.$body));
-
+
$this->_redirectaddr = false;
unset($this->headers);
-
+
while($currentHeader = fgets($fp,$this->_maxlinelen))
{
if ($this->read_timeout > 0 && $this->_check_timeout($fp))
@@ -867,10 +853,10 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
$this->status=-100;
return false;
}
-
+
if($currentHeader == "\r\n")
break;
-
+
// if a header begins with Location: or URI:, set the redirect
if(preg_match("/^(Location:|URI:)/i",$currentHeader))
{
@@ -890,16 +876,16 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
else
$this->_redirectaddr = $matches[2];
}
-
+
if(preg_match("|^HTTP/|",$currentHeader))
{
if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
{
$this->status= $status[1];
- }
+ }
$this->response_code = $currentHeader;
}
-
+
$this->headers[] = $currentHeader;
}
@@ -917,13 +903,13 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
$this->status=-100;
return false;
}
-
+
// check if there is a a redirect meta tag
-
+
if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
{
- $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+ $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
}
// have we hit our frame depth and is there frame src to fetch?
@@ -939,7 +925,7 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
// no framed content
else
$this->results = $results;
-
+
return true;
}
@@ -949,21 +935,21 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
Input: $url the url to fetch
$URI the full URI
$body body contents to send if any (POST)
- Output:
+ Output:
\*======================================================================*/
-
+
function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
- {
+ {
if($this->passcookies && $this->_redirectaddr)
$this->setcookies();
- $headers = array();
-
+ $headers = array();
+
$URI_PARTS = parse_url($URI);
if(empty($url))
$url = "/";
// GET ... header not needed for curl
- //$headers[] = $http_method." ".$url." ".$this->_httpversion;
+ //$headers[] = $http_method." ".$url." ".$this->_httpversion;
if(!empty($this->agent))
$headers[] = "User-Agent: ".$this->agent;
if(!empty($this->host))
@@ -976,10 +962,10 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
if(!empty($this->referer))
$headers[] = "Referer: ".$this->referer;
if(!empty($this->cookies))
- {
+ {
if(!is_array($this->cookies))
$this->cookies = (array)$this->cookies;
-
+
reset($this->cookies);
if ( count($this->cookies) > 0 ) {
$cookie_str = 'Cookie: ';
@@ -1002,44 +988,43 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
else
$headers[] = "Content-type: $content_type";
}
- if(!empty($body))
+ if(!empty($body))
$headers[] = "Content-length: ".strlen($body);
- if(!empty($this->user) || !empty($this->pass))
+ if(!empty($this->user) || !empty($this->pass))
$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
-
+
for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
$safer_header = strtr( $headers[$curr_header], "\"", " " );
$cmdline_params .= " -H \"".$safer_header."\"";
}
-
+
if(!empty($body))
$cmdline_params .= " -d \"$body\"";
-
+
if($this->read_timeout > 0)
$cmdline_params .= " -m ".$this->read_timeout;
-
+
$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)
{
$this->error = "Error: cURL could not retrieve the document, error $return.";
return false;
}
-
-
+
+
$results = implode("\r\n",$results);
-
+
$result_headers = file("$headerfile");
-
+
$this->_redirectaddr = false;
unset($this->headers);
-
+
for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
{
-
+
// if a header begins with Location: or URI:, set the redirect
if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
{
@@ -1059,7 +1044,7 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
else
$this->_redirectaddr = $matches[2];
}
-
+
if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
$this->response_code = $result_headers[$currentHeader];
@@ -1067,10 +1052,10 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
}
// check if there is a a redirect meta tag
-
+
if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
{
- $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+ $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
}
// have we hit our frame depth and is there frame src to fetch?
@@ -1088,7 +1073,7 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
$this->results = $results;
unlink("$headerfile");
-
+
return true;
}
@@ -1096,7 +1081,7 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
Function: setcookies()
Purpose: set cookies for a redirection
\*======================================================================*/
-
+
function setcookies()
{
for($x=0; $x<count($this->headers); $x++)
@@ -1106,7 +1091,7 @@ function setcookies()
}
}
-
+
/*======================================================================*\
Function: _check_timeout
Purpose: checks whether timeout has occurred
@@ -1130,13 +1115,13 @@ function _check_timeout($fp)
Purpose: make a socket connection
Input: $fp file pointer
\*======================================================================*/
-
+
function _connect(&$fp)
{
if(!empty($this->proxy_host) && !empty($this->proxy_port))
{
$this->_isproxy = true;
-
+
$host = $this->proxy_host;
$port = $this->proxy_port;
}
@@ -1145,9 +1130,9 @@ function _connect(&$fp)
$host = $this->host;
$port = $this->port;
}
-
+
$this->status = 0;
-
+
if($fp = fsockopen(
$host,
$port,
@@ -1183,13 +1168,13 @@ function _connect(&$fp)
Purpose: disconnect a socket connection
Input: $fp file pointer
\*======================================================================*/
-
+
function _disconnect($fp)
{
return(fclose($fp));
}
-
+
/*======================================================================*\
Function: _prepare_post_body
Purpose: Prepare post body according to encoding type
@@ -1197,7 +1182,7 @@ function _disconnect($fp)
$formfiles - form upload files
Output: post body
\*======================================================================*/
-
+
function _prepare_post_body($formvars, $formfiles)
{
settype($formvars, "array");
@@ -1206,7 +1191,7 @@ function _prepare_post_body($formvars, $formfiles)
if (count($formvars) == 0 && count($formfiles) == 0)
return;
-
+
switch ($this->_submit_type) {
case "application/x-www-form-urlencoded":
reset($formvars);
@@ -1222,7 +1207,7 @@ function _prepare_post_body($formvars, $formfiles)
case "multipart/form-data":
$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
-
+
reset($formvars);
while(list($key,$val) = each($formvars)) {
if (is_array($val) || is_object($val)) {
@@ -1237,7 +1222,7 @@ function _prepare_post_body($formvars, $formfiles)
$postdata .= "$val\r\n";
}
}
-
+
reset($formfiles);
while (list($field_name, $file_names) = each($formfiles)) {
settype($file_names, "array");
@@ -1245,9 +1230,7 @@ function _prepare_post_body($formvars, $formfiles)
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);
@@ -1263,6 +1246,5 @@ function _prepare_post_body($formvars, $formfiles)
return $postdata;
}
}
-endif;
?>
Please sign in to comment.
Something went wrong with that request. Please try again.