Skip to content
Snippets Groups Projects
Commit cb371dab authored by Adam Andrzej Jaworski's avatar Adam Andrzej Jaworski Committed by Adam Andrzej Jaworski
Browse files

Issue #2825254 by memtkmcc: Debian upgrade - Nginx - invalid number of... 

Issue #2825254 by memtkmcc: Debian upgrade - Nginx - invalid number of arguments in "add_header" directive
parent 231cbbb1
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
http/Provision/Config/Nginx/Inc/vhost_include.tpl.php
+ 8
− 8
View file @ cb371dab
......@@ -114,7 +114,7 @@ if ($is_denied) {
###
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
<?php endif; ?>
<?php if ($satellite_mode == 'boa'): ?>
......@@ -186,7 +186,7 @@ location ^~ /cdn/farfuture/ {
add_header Last-Modified "Wed, 20 Jan 1988 04:20:42 GMT";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
rewrite ^/cdn/farfuture/[^/]+/[^/]+/(.+)$ /$1 break;
try_files $uri @nobots;
}
......@@ -196,7 +196,7 @@ location ^~ /cdn/farfuture/ {
add_header Cache-Control "private, must-revalidate, proxy-revalidate";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
rewrite ^/cdn/farfuture/[^/]+/[^/]+/(.+)$ /$1 break;
try_files $uri @nobots;
}
......@@ -684,7 +684,7 @@ location ~* files/advagg_(?:css|js)/ {
add_header Cache-Control "max-age=31449600, no-transform, public";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
set $nocache_details "Skip";
try_files $uri @nobots;
}
......@@ -990,7 +990,7 @@ location ~* \.xml$ {
add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
charset utf-8;
types { }
default_type text/xml;
......@@ -1069,7 +1069,7 @@ location ~ ^/(?<esi>esi/.*)"$ {
add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
###
### Set correct, local $uri.
###
......@@ -1173,7 +1173,7 @@ location @cache {
add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
charset utf-8;
try_files /cache/normal/$host${uri}_$args.html @drupal;
}
......@@ -1240,7 +1240,7 @@ location = /index.php {
add_header X-Server-Name "$main_site_name";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
<?php endif; ?>
add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
tcp_nopush off;
......
http/Provision/Config/Nginx/server.tpl.php
+ 1
− 1
View file @ cb371dab
......@@ -305,7 +305,7 @@ server {
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
root /var/www/nginx-default;
index index.html index.htm;
<?php else: ?>
......
http/Provision/Config/Nginx/subdir.tpl.php
+ 7
− 7
View file @ cb371dab
......@@ -103,7 +103,7 @@ if ($subdir_main_site_name = '') {
###
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
###
### Helper locations to avoid 404 on legacy images paths
......@@ -238,7 +238,7 @@ location ^~ /<?php print $subdir; ?> {
add_header Last-Modified "Wed, 20 Jan 1988 04:20:42 GMT";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
rewrite ^/<?php print $subdir; ?>/cdn/farfuture/[^/]+/[^/]+/(.+)$ /$1 break;
try_files /$1 $uri @nobots_<?php print $subdir_loc; ?>;
}
......@@ -248,7 +248,7 @@ location ^~ /<?php print $subdir; ?> {
add_header Cache-Control "private, must-revalidate, proxy-revalidate";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
rewrite ^/<?php print $subdir; ?>/cdn/farfuture/[^/]+/[^/]+/(.+)$ /$1 break;
try_files /$1 $uri @nobots_<?php print $subdir_loc; ?>;
}
......@@ -662,7 +662,7 @@ location ^~ /<?php print $subdir; ?> {
add_header Cache-Control "max-age=31449600, no-transform, public";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
set $nocache_details "Skip";
try_files /$1 $uri @nobots_<?php print $subdir_loc; ?>;
}
......@@ -848,7 +848,7 @@ location ^~ /<?php print $subdir; ?> {
add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
charset utf-8;
types { }
default_type text/xml;
......@@ -1027,7 +1027,7 @@ location ^~ /<?php print $subdir; ?> {
add_header X-Response-Status "$status";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
<?php endif; ?>
root <?php print "{$this->root}"; ?>;
......@@ -1138,7 +1138,7 @@ location @cache_<?php print $subdir_loc; ?> {
add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
add_header Access-Control-Allow-Origin *;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-XSS-Protection "1; mode=block";
charset utf-8;
try_files /cache/normal/$host${uri}_$args.html @drupal_<?php print $subdir_loc; ?>;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment