Changeset 4389

Timestamp:

10/13/2006 09:51:34 AM (20 years ago)

Author:

markjaquith

Message:

File handling tweaks in latest SimplePie trunk.

File:

• trunk/wp-includes/simplepie.php (modified) (5 diffs)

trunk/wp-includes/simplepie.php

@@ -6 +6 @@
 
 Version: "Lemon Meringue"
-Updated: 10 October 2006
+Updated: 13 October 2006
 Copyright: 2004-2006 Ryan Parman, Geoffrey Sneddon
 http://simplepie.org
@@ -27 +27 @@
         var $name = 'SimplePie';
         var $version = 'Lemon Meringue';
-        var $build = '20061010';
+        var $build = '20061013';
         var $url = 'http://simplepie.org/';
         var $useragent;
@@ -408 +408 @@
                                 
                                 // 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);
+                                $locate = new $this->locator_class($file, $this->timeout, $this->useragent);
+                                if (!$locate->is_feed($file))
+                                {
                                         $feed = $locate->find();
                                         if ($feed)
@@ -2186 +2186 @@
                                         $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);
@@ -2238 +2238 @@
                         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);
-                                }
-                                $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();
+                                        $info = stream_get_meta_data($this->fp);
+                                }
+                                if (!$info['timed_out'])
+                                {
+                                        $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;
+                                }
                         }
                         else