Browse Source

Merge pull request #654 from mexon/filter_var

Use filter_var instead of parse_url to validate URLs, since the latter r...
pull/656/head
Tobias Diekershoff 8 years ago
parent
commit
e7c705c9a1
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      include/network.php

+ 2
- 4
include/network.php View File

@ -94,8 +94,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
}
if(strpos($newurl,'/') === 0)
$newurl = $url . $newurl;
$url_parsed = @parse_url($newurl);
if (isset($url_parsed)) {
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
$redirects++;
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));
if(strpos($newurl,'/') === 0)
$newurl = $url . $newurl;
$url_parsed = @parse_url($newurl);
if (isset($url_parsed)) {
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
$redirects++;
return fetch_url($newurl,false,$redirects,$timeout);
}


Loading…
Cancel
Save