mirror of
https://github.com/friendica/friendica
synced 2025-04-24 21:50:10 +00:00
Centralize Vary header declaration in ActivityPub::isRequest
- Vary header should be set every time we vary the display based on an HTTP header value
This commit is contained in:
parent
31fbe70ec7
commit
6e2ab6c3af
7 changed files with 7 additions and 8 deletions
|
@ -46,8 +46,6 @@ class Objects extends BaseModule
|
|||
throw new HTTPException\BadRequestException();
|
||||
}
|
||||
|
||||
header('Vary: Accept', false);
|
||||
|
||||
if (!ActivityPub::isRequest()) {
|
||||
DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
|
||||
}
|
||||
|
|
|
@ -115,8 +115,6 @@ class Friendica extends BaseModule
|
|||
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
header('Vary: Accept', false);
|
||||
|
||||
// @TODO: Replace with parameter from router
|
||||
if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
|
||||
if (!ActivityPub::isRequest()) {
|
||||
|
|
|
@ -88,8 +88,6 @@ class Display extends BaseModule
|
|||
|
||||
protected function content(array $request = []): string
|
||||
{
|
||||
header('Vary: Accept', false);
|
||||
|
||||
if (ActivityPub::isRequest()) {
|
||||
$this->baseUrl->redirect(str_replace('display/', 'objects/', $this->args->getQueryString()));
|
||||
}
|
||||
|
|
|
@ -80,8 +80,6 @@ class Profile extends BaseProfile
|
|||
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
header('Vary: Accept', false);
|
||||
|
||||
if (ActivityPub::isRequest()) {
|
||||
$user = $this->database->selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'] ?? '', 'account_removed' => false]);
|
||||
if ($user) {
|
||||
|
|
|
@ -38,6 +38,8 @@ class Xrd extends BaseModule
|
|||
{
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
header('Vary: Accept', false);
|
||||
|
||||
// @TODO: Replace with parameter from router
|
||||
if (DI::args()->getArgv()[0] == 'xrd') {
|
||||
if (empty($_GET['uri'])) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue