grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into signer-ui

Browse Source
This commit is contained in:
Tomasz Drwięga
2016-06-02 17:14:15 +02:00
parent cce18cb4c5 18dac64abb
commit 3e2479cf40
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
signer/Cargo.toml
View File

@@ -17,7 +17,7 @@ env_logger = "0.3"
ws = { git = "https://github.com/ethcore/ws-rs.git" }
ethcore-util = { path = "../util" }
ethcore-rpc = { path = "../rpc" }
parity-minimal-sysui = { path = "../../parity-dapps-minimal-sysui-rs" }
parity-minimal-sysui = { git = "https://github.com/ethcore/parity-dapps-minimal-sysui-rs.git" }
clippy = { version = "0.0.69", optional = true}

3
signer/src/ws_server/session.rs
View File

@@ -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)
})