Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 05:43:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13233 from GidiKroon/feature/add-vary-header

Browse source 
Add Vary header in case of content negotiation
This commit is contained in:
Hypolite Petovan 2023-06-25 17:56:19 -04:00 committed by GitHub
commit 7edaeb215d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/ActivityPub/Objects.php
View file

@ -46,6 +46,8 @@ 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()));
}

2
src/Module/Friendica.php
View file

@ -115,6 +115,8 @@ 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()) {

2
src/Module/Item/Display.php
View file

@ -88,6 +88,8 @@ 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()));
}

2
src/Module/Profile/Profile.php
View file

@ -80,6 +80,8 @@ 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) {

3
src/Module/Xrd.php
View file

@ -80,6 +80,8 @@ class Xrd extends BaseModule
throw new NotFoundException('Invalid host name for xrd query: ' . $host);
}
header('Vary: Accept', false);
if ($name == User::getActorName()) {
$owner = User::getSystemAccount();
if (empty($owner)) {
@ -326,7 +328,6 @@ class Xrd extends BaseModule
]);
header('Access-Control-Allow-Origin: *');
System::httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml');
}
}