Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

File handling tweaks in latest SimplePie trunk.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@4389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2006-10-13 09:51:34 +00:00
parent 94fc4bdc61
commit f215d88f18
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-includes/simplepie.php
View File

@ -5,7 +5,7 @@ A PHP-Based RSS and Atom Feed Framework
Takes the hard work out of managing a complete RSS/Atom solution.
Version: "Lemon Meringue"
Updated: 10 October 2006
Updated: 13 October 2006
Copyright: 2004-2006 Ryan Parman, Geoffrey Sneddon
http://simplepie.org
@ -26,7 +26,7 @@ class SimplePie
// SimplePie Info
var $name = 'SimplePie';
var $version = 'Lemon Meringue';
var $build = '20061010';
var $build = '20061013';
var $url = 'http://simplepie.org/';
var $useragent;
var $linkback;
@ -407,9 +407,9 @@ EOT;
}
// Check if the supplied URL is a feed, if it isn't, look for it.
if (!call_user_func(array($this->locator_class, 'is_feed'), $file))
$locate = new $this->locator_class($file, $this->timeout, $this->useragent);
if (!$locate->is_feed($file))
{
$locate = new $this->locator_class($file, $this->timeout, $this->useragent);
$feed = $locate->find();
if ($feed)
{
@ -2185,12 +2185,12 @@ class SimplePie_File
$info = stream_get_meta_data($this->fp);
$data = '';
while (strpos($data, "\r\n\r\n") === false && $info['timed_out'] === false)
while (strpos($data, "\r\n\r\n") === false && !$info['timed_out'])
{
$data .= fgets($this->fp, 128);
$info = stream_get_meta_data($this->fp);
}
if ($info['timed_out'] === false)
if (!$info['timed_out'])
{
$this->headers = $this->parse_headers($data);
if (($this->headers['status']['code'] == 301 || $this->headers['status']['code'] == 302 || $this->headers['status']['code'] == 303 || $this->headers['status']['code'] == 307) && !empty($this->headers['location']) && $this->redirects < $redirects)
@ -2237,18 +2237,27 @@ class SimplePie_File
{
if ($this->fp)
{
$info = stream_get_meta_data($this->fp);
$this->body = '';
while (!feof($this->fp))
while (!$info['eof'] && !$info['timed_out'])
{
$this->body .= fread($this->fp, 1024);
$info = stream_get_meta_data($this->fp);
}
$this->body = trim($this->body);
if ($this->method == 'fsockopen' && !empty($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip')
if (!$info['timed_out'])
{
$this->body = substr($this->body, 10);
$this->body = gzinflate($this->body);
$this->body = trim($this->body);
if ($this->method == 'fsockopen' && !empty($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip')
{
$this->body = substr($this->body, 10);
$this->body = gzinflate($this->body);
}
$this->close();
}
else
{
return false;
}
$this->close();
}
else
{