Browse Source

upgrade simplepie to 1.5.6

pull/3404/head
Andreas Gohr 2 months ago
parent
commit
c85f645e12
  1. 12
      composer.lock
  2. 12
      vendor/composer/installed.json
  3. 2
      vendor/simplepie/simplepie/README.markdown
  4. 8
      vendor/simplepie/simplepie/idn/idna_convert.class.php
  5. 4
      vendor/simplepie/simplepie/library/SimplePie.php
  6. 2
      vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
  7. 9
      vendor/simplepie/simplepie/library/SimplePie/File.php
  8. 2
      vendor/simplepie/simplepie/library/SimplePie/Locator.php
  9. 5
      vendor/simplepie/simplepie/library/SimplePie/Misc.php

12
composer.lock

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "f43d3a0e0afb925e14da17a3b8323a29",
"content-hash": "cd951937a517d2f058327d0429efe7ff",
"packages": [
{
"name": "aziraphale/email-address-validator",
@ -298,16 +298,16 @@
},
{
"name": "simplepie/simplepie",
"version": "1.5.5",
"version": "1.5.6",
"source": {
"type": "git",
"url": "https://github.com/simplepie/simplepie.git",
"reference": "ae49e2201b6da9c808e5dac437aca356a11831b4"
"reference": "1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/ae49e2201b6da9c808e5dac437aca356a11831b4",
"reference": "ae49e2201b6da9c808e5dac437aca356a11831b4",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6",
"reference": "1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6",
"shasum": ""
},
"require": {
@ -361,7 +361,7 @@
"feeds",
"rss"
],
"time": "2020-05-01T12:23:14+00:00"
"time": "2020-10-14T07:17:22+00:00"
},
{
"name": "splitbrain/php-archive",

12
vendor/composer/installed.json

@ -301,17 +301,17 @@
},
{
"name": "simplepie/simplepie",
"version": "1.5.5",
"version_normalized": "1.5.5.0",
"version": "1.5.6",
"version_normalized": "1.5.6.0",
"source": {
"type": "git",
"url": "https://github.com/simplepie/simplepie.git",
"reference": "ae49e2201b6da9c808e5dac437aca356a11831b4"
"reference": "1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/ae49e2201b6da9c808e5dac437aca356a11831b4",
"reference": "ae49e2201b6da9c808e5dac437aca356a11831b4",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6",
"reference": "1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6",
"shasum": ""
},
"require": {
@ -330,7 +330,7 @@
"ext-mbstring": "",
"mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
},
"time": "2020-05-01T12:23:14+00:00",
"time": "2020-10-14T07:17:22+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

2
vendor/simplepie/simplepie/README.markdown

@ -91,7 +91,7 @@ Authors and contributors
* [Michael Shipley][] (Submitter of patches, support)
* [Steve Minutillo][] (Submitter of patches)
[Malcolm Blaney]: https://unicyclic.com/mal
[Malcolm Blaney]: https://mblaney.xyz
[Ryan McCue]: http://ryanmccue.info
[Ryan Parman]: http://ryanparman.com
[Sam Sneddon]: https://gsnedders.com

8
vendor/simplepie/simplepie/idn/idna_convert.class.php

@ -374,7 +374,7 @@ class idna_convert
$delim_pos = strrpos($encoded, '-');
if ($delim_pos > strlen($this->_punycode_prefix)) {
for ($k = strlen($this->_punycode_prefix); $k < $delim_pos; ++$k) {
$decoded[] = ord($encoded{$k});
$decoded[] = ord($encoded[$k]);
}
} else {
$decoded = array();
@ -390,7 +390,7 @@ class idna_convert
for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
$digit = $this->_decode_digit($encoded{$enco_idx++});
$digit = $this->_decode_digit($encoded[$enco_idx++]);
$idx += $digit * $w;
$t = ($k <= $bias) ? $this->_tmin :
(($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
@ -793,7 +793,7 @@ class idna_convert
$mode = 'next';
$test = 'none';
for ($k = 0; $k < $inp_len; ++$k) {
$v = ord($input{$k}); // Extract byte from input string
$v = ord($input[$k]); // Extract byte from input string
if ($v < 128) { // We found an ASCII char - put into stirng as is
$output[$out_len] = $v;
@ -932,7 +932,7 @@ class idna_convert
$out_len++;
$output[$out_len] = 0;
}
$output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
$output[$out_len] += ord($input[$i]) << (8 * (3 - ($i % 4) ) );
}
return $output;
}

4
vendor/simplepie/simplepie/library/SimplePie.php

@ -33,7 +33,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package SimplePie
* @version 1.5.5
* @version 1.5.6
* @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue
* @author Ryan Parman
* @author Sam Sneddon
@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie');
/**
* SimplePie Version
*/
define('SIMPLEPIE_VERSION', '1.5.5');
define('SIMPLEPIE_VERSION', '1.5.6');
/**
* SimplePie Build

2
vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php

@ -150,7 +150,7 @@ class SimplePie_Content_Type_Sniffer
}
elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
{
return 'application/octect-stream';
return 'application/octet-stream';
}
return 'text/plain';

9
vendor/simplepie/simplepie/library/SimplePie/File.php

@ -109,11 +109,6 @@ class SimplePie_File
curl_setopt($fp, CURLOPT_REFERER, $url);
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);
}
@ -148,7 +143,7 @@ class SimplePie_File
$this->redirects++;
$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;
}
@ -233,7 +228,7 @@ class SimplePie_File
$this->redirects++;
$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;
}

2
vendor/simplepie/simplepie/library/SimplePie/Locator.php

@ -94,7 +94,7 @@ class SimplePie_Locator
$this->registry = $registry;
}
public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working)
public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working = null)
{
if ($this->is_feed($this->file))
{

5
vendor/simplepie/simplepie/library/SimplePie/Misc.php

@ -364,11 +364,12 @@ class SimplePie_Misc
}
// Check that the encoding is supported
if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80")
if (!in_array($input, mb_list_encodings()))
{
return false;
}
if (!in_array($input, mb_list_encodings()))
if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80")
{
return false;
}

Loading…
Cancel
Save