strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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

2
mod/fetch.php
View file

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

2
mod/p.php
View file

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