Changeset 11600

Timestamp:

06/18/2009 07:38:23 PM (15 years ago)

Author:

ryan

Message:

Reduce SimplePie memory usage. Props link92. fixes #10147 for 2.8.1

File:

• branches/2.8/wp-includes/class-simplepie.php (modified) (5 diffs)

branches/2.8/wp-includes/class-simplepie.php

@@ -752 +752 @@
     function __destruct()
     {
-        if (!empty($this->data['items']))
-        {
-            foreach ($this->data['items'] as $item)
-            {
-                $item->__destruct();
-            }
-            unset($this->data['items']);
-        }
-        if (!empty($this->data['ordered_items']))
-        {
-            foreach ($this->data['ordered_items'] as $item)
-            {
-                $item->__destruct();
-            }
-            unset($this->data['ordered_items']);
+        if (version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled())
+        {
+            if (!empty($this->data['items']))
+            {
+                foreach ($this->data['items'] as $item)
+                {
+                    $item->__destruct();
+                }
+                unset($item, $this->data['items']);
+            }
+            if (!empty($this->data['ordered_items']))
+            {
+                foreach ($this->data['ordered_items'] as $item)
+                {
+                    $item->__destruct();
+                }
+                unset($item, $this->data['ordered_items']);
+            }
         }
     }
@@ -3083 +3086 @@
     function __destruct()
     {
-        unset($this->feed);
+        if (version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled())
+        {
+            unset($this->feed);
+        }
     }
 
@@ -5683 +5689 @@
     }
 
-    /**
-     * Remove items that link back to this before destroying this object
-     */
-    function __destruct()
-    {
-        unset($this->item);
-    }
-
     function get_source_tags($namespace, $tag)
     {
@@ -8955 +8953 @@
     function parse_url($url)
     {
-        static $cache = array();
-        if (isset($cache[$url]))
-        {
-            return $cache[$url];
-        }
-        elseif (preg_match('/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/', $url, $match))
-        {
-            for ($i = count($match); $i <= 9; $i++)
-            {
-                $match[$i] = '';
-            }
-            return $cache[$url] = array('scheme' => $match[2], 'authority' => $match[4], 'path' => $match[5], 'query' => $match[7], 'fragment' => $match[9]);
-        }
-        else
-        {
-            return $cache[$url] = array('scheme' => '', 'authority' => '', 'path' => '', 'query' => '', 'fragment' => '');
-        }
+        preg_match('/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/', $url, $match);
+        for ($i = count($match); $i <= 9; $i++)
+        {
+            $match[$i] = '';
+        }
+        return array('scheme' => $match[2], 'authority' => $match[4], 'path' => $match[5], 'query' => $match[7], 'fragment' => $match[9]);
     }
 
@@ -10810 +10797 @@
     function codepoint_to_utf8($codepoint)
     {
-        static $cache = array();
         $codepoint = (int) $codepoint;
-        if (isset($cache[$codepoint]))
-        {
-            return $cache[$codepoint];
-        }
-        elseif ($codepoint < 0)
-        {
-            return $cache[$codepoint] = false;
+        if ($codepoint < 0)
+        {
+            return false;
         }
         else if ($codepoint <= 0x7f)
         {
-            return $cache[$codepoint] = chr($codepoint);
+            return chr($codepoint);
         }
         else if ($codepoint <= 0x7ff)
         {
-            return $cache[$codepoint] = chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
         }
         else if ($codepoint <= 0xffff)
         {
-            return $cache[$codepoint] = chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
         }
         else if ($codepoint <= 0x10ffff)
         {
-            return $cache[$codepoint] = chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
         }
         else
         {
             // U+FFFD REPLACEMENT CHARACTER
-            return $cache[$codepoint] = "\xEF\xBF\xBD";
+            return "\xEF\xBF\xBD";
         }
     }