aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.htaccess1
-rw-r--r--lib/private/legacy/response.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/.htaccess b/.htaccess
index cc2e0c95eb1..ba9ec86081a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -17,6 +17,7 @@
Header set X-Download-Options "noopen"
Header set X-Permitted-Cross-Domain-Policies "none"
Header set Referrer-Policy "no-referrer"
+ Header set X-Frame-Options "SAMEORIGIN"
SetEnv modHeadersAvailable true
</IfModule>
diff --git a/lib/private/legacy/response.php b/lib/private/legacy/response.php
index 361a085c0c0..01c96c09222 100644
--- a/lib/private/legacy/response.php
+++ b/lib/private/legacy/response.php
@@ -94,7 +94,6 @@ class OC_Response {
. 'object-src \'none\'; '
. 'base-uri \'self\'; ';
header('Content-Security-Policy:' . $policy);
- header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
// Send fallback headers for installations that don't have the possibility to send
// custom headers on the webserver side
@@ -105,6 +104,7 @@ class OC_Response {
header('X-Download-Options: noopen'); // https://msdn.microsoft.com/en-us/library/jj542450(v=vs.85).aspx
header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
header('Referrer-Policy: no-referrer'); // https://www.w3.org/TR/referrer-policy/
+ header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
}
}