Merge pull request #13488 from MrPetovan/bug/frio-search-result-padding

[friendica.git] / src / Module / Xrd.php

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 71a3d37a9e996e81e34710055fd60f526d1abdb2..097ec3c3224ddcf743a316452425afb827e38143 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'])) {
@@ -80,6 +82,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)) {
@@ -152,8 +156,7 @@ class Xrd extends BaseModule
                        ]
                ];
                header('Access-Control-Allow-Origin: *');
-               header('Vary: Accept', false);
-               System::jsonExit($json, 'application/jrd+json; charset=utf-8');
+               $this->jsonExit($json, 'application/jrd+json; charset=utf-8');
        }
 
        private function printJSON(string $alias, array $owner, array $avatar)
@@ -230,8 +233,7 @@ class Xrd extends BaseModule
                ];
 
                header('Access-Control-Allow-Origin: *');
-               header('Vary: Accept', false);
-               System::jsonExit($json, 'application/jrd+json; charset=utf-8');
+               $this->jsonExit($json, 'application/jrd+json; charset=utf-8');
        }
 
        private function printXML(string $alias, array $owner, array $avatar)
@@ -328,7 +330,6 @@ class Xrd extends BaseModule
                ]);
 
                header('Access-Control-Allow-Origin: *');
-               header('Vary: Accept', false);
-               System::httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml');
+               $this->httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml');
        }
 }