mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-25 04:28:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'HTTPS_Everywhere' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite committed 2016-02-22 20:20:31 +01:00
2 parents 98cd61d4c1 1f7647f4df
commit dddde30e2b
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
lib/SimplePie/SimplePie/Misc.php
+3 -3
View File
@@ -83,14 +83,14 @@ class SimplePie_Misc
*/
public static function https_url($url)
{
return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', '//$1', $url);
return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
}
public static function absolutize_url($relative, $base)
{
if (substr($relative, 0, 2) === '//')
{//Allow protocol-relative URLs "//www.example.net" which will pick HTTP or HTTPS automatically
return $relative;
{//Protocol-relative URLs "//www.example.net"
return 'https:' . $relative;
}
$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
if ($iri === false)