Ticket #51521: 51521.diff
File 51521.diff, 3.8 KB (added by , 4 years ago) |
---|
-
src/wp-includes/SimplePie/Content/Type/Sniffer.php
150 150 } 151 151 elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body)) 152 152 { 153 return 'application/octe ct-stream';153 return 'application/octet-stream'; 154 154 } 155 155 156 156 return 'text/plain'; -
src/wp-includes/SimplePie/File.php
109 109 curl_setopt($fp, CURLOPT_REFERER, $url); 110 110 curl_setopt($fp, CURLOPT_USERAGENT, $useragent); 111 111 curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2); 112 if (!ini_get('open_basedir') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))113 {114 curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);115 curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);116 }117 112 foreach ($curl_options as $curl_param => $curl_value) { 118 113 curl_setopt($fp, $curl_param, $curl_value); 119 114 } … … 148 143 $this->redirects++; 149 144 $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url); 150 145 $previousStatusCode = $this->status_code; 151 $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen );146 $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options); 152 147 $this->permanent_url = ($previousStatusCode == 301) ? $location : $url; 153 148 return; 154 149 } … … 233 228 $this->redirects++; 234 229 $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url); 235 230 $previousStatusCode = $this->status_code; 236 $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen );231 $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options); 237 232 $this->permanent_url = ($previousStatusCode == 301) ? $location : $url; 238 233 return; 239 234 } -
src/wp-includes/SimplePie/Locator.php
94 94 $this->registry = $registry; 95 95 } 96 96 97 public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working )97 public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working = null) 98 98 { 99 99 if ($this->is_feed($this->file)) 100 100 { -
src/wp-includes/SimplePie/Misc.php
364 364 } 365 365 366 366 // Check that the encoding is supported 367 if ( @mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80")367 if (!in_array($input, mb_list_encodings())) 368 368 { 369 369 return false; 370 370 } 371 if (!in_array($input, mb_list_encodings())) 371 372 if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80") 372 373 { 373 374 return false; 374 375 } -
src/wp-includes/class-simplepie.php
68 68 * POSSIBILITY OF SUCH DAMAGE. 69 69 * 70 70 * @package SimplePie 71 * @version 1.5. 571 * @version 1.5.6 72 72 * @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue 73 73 * @author Ryan Parman 74 74 * @author Sam Sneddon … … 85 85 /** 86 86 * SimplePie Version 87 87 */ 88 define('SIMPLEPIE_VERSION', '1.5. 5');88 define('SIMPLEPIE_VERSION', '1.5.6'); 89 89 90 90 /** 91 91 * SimplePie Build