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

Merge pull request #2651 from annando/1606-fetch-loop 

Avoid redirection loops at /fetch/ and /p/
This commit is contained in:
rabuzarus 2016-06-30 15:21:28 +02:00 committed by GitHub
parent cb3704ab43 a7ee8a8bc9
commit b2e21ca7b8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/fetch.php
View File

@ -27,11 +27,13 @@ function fetch_init($a){
$parts = parse_url($r[0]["author-link"]);
$host = $parts["scheme"]."://".$parts["host"];
$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
if (normalise_link($host) != normalise_link(App::get_baseurl())) {
$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
header("HTTP/1.1 301 Moved Permanently");
header("Location:".$location);
killme();
header("HTTP/1.1 301 Moved Permanently");
header("Location:".$location);
killme();
}
}
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));

10
mod/p.php
View File

@ -31,11 +31,13 @@ function p_init($a){
$parts = parse_url($r[0]["author-link"]);
$host = $parts["scheme"]."://".$parts["host"];
$location = $host."/p/".urlencode($guid).".xml";
if (normalise_link($host) != normalise_link(App::get_baseurl())) {
$location = $host."/p/".urlencode($guid).".xml";
header("HTTP/1.1 301 Moved Permanently");
header("Location:".$location);
killme();
header("HTTP/1.1 301 Moved Permanently");
header("Location:".$location);
killme();
}
}
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));