MAGETWO-43510: x-frame-options missing from setup

safwkhan · safwkhan · commit 172dfaaa890e · 2015-10-08T17:25:07.000-05:00
- Fixed based on QA feedback.
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -90,6 +90,7 @@ location /static/ {
     if (!-f $request_filename) {
         rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
     }
+    add_header X-Frame-Options "SAMEORIGIN";
 }
 
 location /media/ {
@@ -109,6 +110,7 @@ location /media/ {
         expires    off;
         try_files $uri $uri/ /get.php?$args;
     }
+    add_header X-Frame-Options "SAMEORIGIN";
 }
 
 location /media/customer/ {

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ location /static/ {`
`90`	`90`	`if (!-f $request_filename) {`
`91`	`91`	`rewrite ^/static/(version\d/)?(.)$ /static.php?resource=$2 last;`
`92`	`92`	`}`
	`93`	`+ add_header X-Frame-Options "SAMEORIGIN";`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`location /media/ {`
`@@ -109,6 +110,7 @@ location /media/ {`
`109`	`110`	`expires off;`
`110`	`111`	`try_files $uri $uri/ /get.php?$args;`
`111`	`112`	`}`
	`113`	`+ add_header X-Frame-Options "SAMEORIGIN";`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`location /media/customer/ {`