Changeset 52393 for trunk/src/wp-includes/class-simplepie.php

Timestamp:

12/20/2021 07:31:37 PM (3 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update the SimplePie library to version 1.5.7.

This version shows significant improvements in the compatibility of SimplePie with PHP 8.0, 8.1, and even contains an initial PHP 8.2 fix. The release also contains a number of other bug fixes.

Release notes: ​https://github.com/simplepie/simplepie/releases/tag/1.5.7

For a full list of changes in this update, see the SimplePie GitHub:
​https://github.com/simplepie/simplepie/compare/1.5.6...1.5.7

Follow-up to [47733], [49176].

Props jrf, SergeyBiryukov.
Fixes #54659.

File:

• trunk/src/wp-includes/class-simplepie.php (modified) (10 diffs)

trunk/src/wp-includes/class-simplepie.php

@@ -461 +461 @@
 
     /**
+     * @var int HTTP status code
+     * @see SimplePie::status_code()
+     * @access private
+     */
+    public $status_code;
+
+    /**
      * @var object Instance of SimplePie_Sanitize (or other class)
      * @see SimplePie::set_sanitize_class()
@@ -945 +952 @@
 
     /**
+     * Return the filename (i.e. hash, without path and without extension) of the file to cache a given URL.
+     * @param string $url The URL of the feed to be cached.
+     * @return string A filename (i.e. hash, without path and without extension).
+     */
+    public function get_cache_filename($url)
+    {
+        // Append custom parameters to the URL to avoid cache pollution in case of multiple calls with different parameters.
+        $url .= $this->force_feed ? '#force_feed' : '';
+        $options = array();
+        if ($this->timeout != 10)
+        {
+            $options[CURLOPT_TIMEOUT] = $this->timeout;
+        }
+        if ($this->useragent !== SIMPLEPIE_USERAGENT)
+        {
+            $options[CURLOPT_USERAGENT] = $this->useragent;
+        }
+        if (!empty($this->curl_options))
+        {
+            foreach ($this->curl_options as $k => $v)
+            {
+                $options[$k] = $v;
+            }
+        }
+        if (!empty($options))
+        {
+            ksort($options);
+            $url .= '#' . urlencode(var_export($options, true));
+        }
+        return call_user_func($this->cache_name_function, $url);
+    }
+
+    /**
      * Set whether feed items should be sorted into reverse chronological order
      *
@@ -1182 +1222 @@
             $this->add_attributes(false);
             $this->set_image_handler(false);
+            $this->set_https_domains(array());
         }
     }
@@ -1285 +1326 @@
 
     /**
+     * Set the list of domains for which to force HTTPS.
+     * @see SimplePie_Sanitize::set_https_domains()
+     * @param array List of HTTPS domains. Example array('biz', 'example.com', 'example.org', 'www.example.net').
+     */
+    public function set_https_domains($domains = array())
+    {
+        if (is_array($domains))
+        {
+            $this->sanitize->set_https_domains($domains);
+        }
+    }
+
+    /**
      * Set the handler to enable the display of cached images.
      *
@@ -1409 +1463 @@
             if ($this->cache && $parsed_feed_url['scheme'] !== '')
             {
-                $url = $this->feed_url . ($this->force_feed ? '#force_feed' : '');
-                $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $url), 'spc'));
+                $filename = $this->get_cache_filename($this->feed_url);
+                $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $filename, 'spc'));
             }
 
@@ -1550 +1604 @@
      *
      * If the data is already cached, attempt to fetch it from there instead
-     * @param SimplePie_Cache|false $cache Cache handler, or false to not load from the cache
+     * @param SimplePie_Cache_Base|false $cache Cache handler, or false to not load from the cache
      * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type
      */
@@ -1613 +1667 @@
 
                         $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
+                        $this->status_code = $file->status_code;
 
                         if ($file->success)
@@ -1667 +1722 @@
             }
         }
+        $this->status_code = $file->status_code;
+
         // If the file connection has an error, set SimplePie::error to that and quit
         if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
@@ -1774 +1831 @@
 
     /**
+     * Get the last HTTP status code
+     *
+     * @return int Status code
+     */
+    public function status_code()
+    {
+        return $this->status_code;
+    }
+
+    /**
      * Get the raw XML
      *
@@ -2616 +2683 @@
         }
 
-        if (isset($this->data['headers']['link']) &&
-            preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/',
-                       $this->data['headers']['link'], $match))
-        {
-            return array($match[1]);
-        }
-        else if (isset($this->data['links'][$rel]))
+        if (isset($this->data['headers']['link']))
+        {
+            $link_headers = $this->data['headers']['link'];
+            if (is_string($link_headers)) {
+                $link_headers = array($link_headers);
+            }
+            $matches = preg_filter('/<([^>]+)>; rel='.preg_quote($rel).'/', '$1', $link_headers);
+            if (!empty($matches)) {
+                return $matches;
+            }
+        }
+
+        if (isset($this->data['links'][$rel]))
         {
             return $this->data['links'][$rel];