Merge branch 'master' into signer-ui

2016-06-02 17:14:15 +02:00
parent cce18cb4c5 18dac64abb
commit 3e2479cf40
7 changed files with 10 additions and 8 deletions
--- a/signer/src/ws_server/session.rs
+++ b/signer/src/ws_server/session.rs
@@ -48,6 +48,9 @@ impl ws::Handler for Session {
 						headers.push(("Connection".into(), b"Closed".to_vec()));
 						headers.push(("Content-Length".into(), content_len.as_bytes().to_vec()));
 						headers.push(("Content-Type".into(), f.mime.as_bytes().to_vec()));
+						if !f.safe_to_embed {
+							headers.push(("X-Frame-Options".into(), b"SAMEORIGIN".to_vec()));
+						}
 					}
 					Ok(res)
 				})