Changeset 49176 for trunk/src/wp-includes/SimplePie/File.php

Timestamp:

10/16/2020 05:18:11 PM (5 years ago)

Author:

desrosj

Message:

External Libraries: Update the SimplePie library to version 1.5.6.

This version fixes a handful of PHP 8 compatibility issues.

A full list of changes included in this update can be found on GitHub: ​https://github.com/simplepie/simplepie/compare/1.5.5...1.5.6.

Props jrf, ayeshrajans.
Fixes #51521.

File:

• trunk/src/wp-includes/SimplePie/File.php (modified) (3 diffs)

trunk/src/wp-includes/SimplePie/File.php

@@ -110 +110 @@
                 curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
                 curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
-                if (!ini_get('open_basedir') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
-                {
-                    curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
-                    curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
-                }
                 foreach ($curl_options as $curl_param => $curl_value) {
                     curl_setopt($fp, $curl_param, $curl_value);
@@ -149 +144 @@
                             $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
                             $previousStatusCode = $this->status_code;
-                            $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+                            $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options);
                             $this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
                             return;
@@ -234 +229 @@
                                 $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
                                 $previousStatusCode = $this->status_code;
-                                $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+                                $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options);
                                 $this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
                                 return;