clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this.

This commit is contained in:
Michael Vogel 2013-01-13 18:51:48 +01:00
parent 5501dd0759
commit 452ff19d73
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/network.php
View File

@ -76,9 +76,17 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
} }
if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) { if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
$matches = array(); $new_location_info = @parse_url($curl_info["redirect_url"]);
preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); $old_location_info = @parse_url($curl_info["url"]);
$newurl = trim(array_pop($matches));
$newurl = $curl_info["redirect_url"];
if (($new_location_info["path"] == "") AND ($new_location_info["host"] != ""))
$newurl = $new_location_info["scheme"]."://".$new_location_info["host"].$old_location_info["path"];
//$matches = array();
//preg_match('/(Location:|URI:)(.*?)\n/', $header, $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); $url_parsed = @parse_url($newurl);