Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #6620 - Stop panicking while establishing a WebSocket connection (from Ms2ger:ws-crash); r=jdm

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: d91a6f3834aa7fbf47148480e16d06d9e3891340
This commit is contained in:
Ms2ger 2015-07-14 02:06:17 -06:00
parent a2a4f810b8
commit 8985822b47
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
servo/components/script/dom/websocket.rs
View File

@ -33,6 +33,7 @@ use websocket::stream::WebSocketStream;
use websocket::client::request::Url;
use websocket::Client;
use websocket::header::Origin;
use websocket::result::WebSocketResult;
#[derive(JSTraceable, PartialEq, Copy, Clone)]
enum WebSocketRequestState {
@ -101,6 +102,19 @@ fn parse_web_socket_url(url_str: &str) -> Fallible<(Url, String, u16, String, bo
Ok((parsed_url, host, port, resource, secure))
}
/// *Establish a WebSocket Connection* as defined in RFC 6455.
fn establish_a_websocket_connection(url: Url, origin: String)
-> WebSocketResult<(Sender<WebSocketStream>, Receiver<WebSocketStream>)> {
let mut request = try!(Client::connect(url));
request.headers.set(Origin(origin));
let response = try!(request.send());
try!(response.validate());
Ok(response.begin().split())
}
impl WebSocket {
pub fn new_inherited(global: GlobalRef, url: Url) -> WebSocket {
WebSocket {
@ -138,11 +152,11 @@ impl WebSocket {
global,
WebSocketBinding::Wrap);
// TODO Client::connect does not conform to RFC 6455
// see https://github.com/cyderize/rust-websocket/issues/38
let mut request = match Client::connect(url) {
Ok(request) => request,
Err(_) => {
let channel = establish_a_websocket_connection(url, global.get_url().serialize());
let (temp_sender, temp_receiver) = match channel {
Ok(channel) => channel,
Err(e) => {
debug!("Failed to establish a WebSocket connection: {:?}", e);
let global_root = ws.r().global.root();
let address = Trusted::new(global_root.r().get_cx(), ws.r(), global_root.r().script_chan().clone());
let task = box WebSocketTaskHandler::new(address, WebSocketTask::Close);
@ -150,11 +164,7 @@ impl WebSocket {
return Ok(ws);
}
};
request.headers.set(Origin(global.get_url().serialize()));
let response = request.send().unwrap();
response.validate().unwrap();
let (temp_sender, temp_receiver) = response.begin().split();
*ws.r().sender.borrow_mut() = Some(temp_sender);
*ws.r().receiver.borrow_mut() = Some(temp_receiver);