This commit is contained in:
Bogdan Cuza 2015-07-02 22:58:39 +03:00 committed by Josh Matthews
parent 12195a5c4a
commit 35d5328271

View file

@ -32,6 +32,7 @@ use websocket::client::receiver::Receiver;
use websocket::stream::WebSocketStream; use websocket::stream::WebSocketStream;
use websocket::client::request::Url; use websocket::client::request::Url;
use websocket::Client; use websocket::Client;
use websocket::header::Origin;
#[derive(JSTraceable, PartialEq, Copy, Clone)] #[derive(JSTraceable, PartialEq, Copy, Clone)]
enum WebSocketRequestState { enum WebSocketRequestState {
@ -139,7 +140,7 @@ impl WebSocket {
// TODO Client::connect does not conform to RFC 6455 // TODO Client::connect does not conform to RFC 6455
// see https://github.com/cyderize/rust-websocket/issues/38 // see https://github.com/cyderize/rust-websocket/issues/38
let request = match Client::connect(url) { let mut request = match Client::connect(url) {
Ok(request) => request, Ok(request) => request,
Err(_) => { Err(_) => {
let global_root = ws.r().global.root(); let global_root = ws.r().global.root();
@ -149,6 +150,7 @@ impl WebSocket {
return Ok(ws); return Ok(ws);
} }
}; };
request.headers.set(Origin(global.get_url().serialize()));
let response = request.send().unwrap(); let response = request.send().unwrap();
response.validate().unwrap(); response.validate().unwrap();