Merge pull request #2651 from annando/1606-fetch-loop
Avoid redirection loops at /fetch/ and /p/
This commit is contained in:
commit
b2e21ca7b8
|
@ -27,11 +27,13 @@ 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"];
|
||||||
|
|
||||||
$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("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'));
|
||||||
|
|
10
mod/p.php
10
mod/p.php
|
@ -31,11 +31,13 @@ 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"];
|
||||||
|
|
||||||
$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("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'));
|
||||||
|
|
Loading…
Reference in a new issue