mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-06 23:53:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'HTTPS_Everywhere' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite
2016-02-29 17:10:22 +01:00
parent 98a27132c0 d344da59fd
commit fb91fb7fb3
2 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/force-https.default.txt
View File

@@ -1,4 +1,6 @@
dailymotion.com
feedburner.com
gstatic.com
tumblr.com
wordpress.com
youtube.com

58
lib/SimplePie/SimplePie/Sanitize.php
View File

@@ -263,23 +263,20 @@ class SimplePie_Sanitize
{
$domain = trim($domain, ". \t\n\r\0\x0B");
$segments = array_reverse(explode('.', $domain));
if (count($segments) > 0)
{
$node =& $this->https_domains;
foreach ($segments as $segment)
{//Build a tree
if ($node === true)
{
break;
}
if (!isset($node[$segment]))
{
$node[$segment] = array();
}
$node =& $node[$segment];
$node =& $this->https_domains;
foreach ($segments as $segment)
{//Build a tree
if ($node === true)
{
break;
}
$node = true;
if (!isset($node[$segment]))
{
$node[$segment] = array();
}
$node =& $node[$segment];
}
$node = true;
}
}
@@ -291,23 +288,20 @@ class SimplePie_Sanitize
{
$domain = trim($domain, '. ');
$segments = array_reverse(explode('.', $domain));
if (count($segments) > 0)
{
$node =& $this->https_domains;
foreach ($segments as $segment)
{//Explore the tree
if ($node === true)
{
return true;
}
if (isset($node[$segment]))
{
$node =& $node[$segment];
}
else
{
break;
}
$node =& $this->https_domains;
foreach ($segments as $segment)
{//Explore the tree
if ($node === true)
{
return true;
}
if (isset($node[$segment]))
{
$node =& $node[$segment];
}
else
{
break;
}
}
return false;