keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #654 from mexon/filter_var

Browse source 
Use filter_var instead of parse_url to validate URLs, since the latter r...
This commit is contained in:
tobiasd 2013-03-26 11:31:11 -07:00
commit e7c705c9a1
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/network.php
View file

@ -94,8 +94,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
} }
if(strpos($newurl,'/') === 0) if(strpos($newurl,'/') === 0)
$newurl = $url . $newurl; $newurl = $url . $newurl;
$url_parsed = @parse_url($newurl); if (filter_var($newurl, FILTER_VALIDATE_URL)) {
if (isset($url_parsed)) {
$redirects++; $redirects++;
return fetch_url($newurl,$binary,$redirects,$timeout); return fetch_url($newurl,$binary,$redirects,$timeout);
} }
@ -189,8 +188,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
$newurl = trim(array_pop($matches)); $newurl = trim(array_pop($matches));
if(strpos($newurl,'/') === 0) if(strpos($newurl,'/') === 0)
$newurl = $url . $newurl; $newurl = $url . $newurl;
$url_parsed = @parse_url($newurl); if (filter_var($newurl, FILTER_VALIDATE_URL)) {
if (isset($url_parsed)) {
$redirects++; $redirects++;
return fetch_url($newurl,false,$redirects,$timeout); return fetch_url($newurl,false,$redirects,$timeout);
} }