Centralize Vary header declaration in ActivityPub::isRequest

- Vary header should be set every time we vary the display based on an HTTP header value

diff --git a/src/App.php b/src/App.php
index 8d253ec76ffb6a04fef34d8827082e205235b4d8..a48e21571d85f86a8dd0c0bf9bb675fb56053716 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -695,6 +695,9 @@ class App
                                $module = $router->getModule();
                        }
 
+                       // Display can change depending on the requested language, so it shouldn't be cached whole
+                       header('Vary: Accept-Language', false);
+
                        // Processes data from GET requests
                        $httpinput = $httpInput->process();
                        $input     = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index f93c8b95747a1561ef873fd1c8afb3ce5258017b..34d4609511447a577b32b413badac788dd331ed6 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -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()));
                }

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 73d5f633cd327c517ff8d6d6eee2ec5f8645b858..90869878e47b131e32aab5c784a00902496419ac 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -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()) {

diff --git a/src/Module/Item/Display.php b/src/Module/Item/Display.php
index a0d1ecbf56d81263d3aca04b192bf4aa0357b985..b2ed43c5b51d707125818e8b68aadbada5c6958f 100644 (file)
--- a/src/Module/Item/Display.php
+++ b/src/Module/Item/Display.php
@@ -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()));
                }

diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 31ef8d05bff3f45aea713ba8b541419a348c8d15..5e5028cb865f76c50a20b73162ce6f5378dae1d1 100644 (file)
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -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) {

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 3267e9e9a24bbeecb6daa7d92754a29687c3bf7d..af40bc3b026aaed3ebf73c2516965d44b1f424fe 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -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'])) {

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index eaf34669ba27c1c514daf9f1e92dd2352bfb4953..ad1e9367cad4df50aa47b4546878352477ad165c 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -87,6 +87,8 @@ class ActivityPub
         */
        public static function isRequest(): bool
        {
+               header('Vary: Accept', false);
+
                $isrequest = stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
                        stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
                        stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');