Merge tag '4.7.17.3' into develop

4.7.17.3

# Conflicts:
#	changelog.md
#	config/firefly.php
This commit is contained in:
James Cole
2019-07-16 19:24:07 +02:00
8 changed files with 42 additions and 12 deletions

View File

@@ -87,7 +87,11 @@ class SecureHeaders
if (false === $disableFrameHeader || null === $disableFrameHeader) {
$response->header('X-Frame-Options', 'deny');
}
$response->header('Content-Security-Policy', implode('; ', $csp));
// content security policy may be set elsewhere.
if (!$response->headers->has('Content-Security-Policy')) {
$response->header('Content-Security-Policy', implode('; ', $csp));
}
$response->header('X-XSS-Protection', '1; mode=block');
$response->header('X-Content-Type-Options', 'nosniff');
$response->header('Referrer-Policy', 'no-referrer');