diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-06-12 09:40:57 +0200 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-06-12 09:40:57 +0200 |
commit | 230c4201f3fcd283da732c5e425891e2dcaf94f0 (patch) | |
tree | a55366d615103688806f565bcacfb94a35ac6b1e /components/script/dom/websocket.rs | |
parent | c8f322b2672758bbf3c43720bfcf54391472250e (diff) | |
download | servo-230c4201f3fcd283da732c5e425891e2dcaf94f0.tar.gz servo-230c4201f3fcd283da732c5e425891e2dcaf94f0.zip |
Revert "WebSocket constructor should not panic"
This reverts commit 877c369e0bc5db4286457be36d015eeb1f0ae2f2.
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r-- | components/script/dom/websocket.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 9272346d416..c0c6a624862 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -141,16 +141,7 @@ impl WebSocket { // TODO Client::connect does not conform to RFC 6455 // see https://github.com/cyderize/rust-websocket/issues/38 - let request = match Client::connect(parsed_url) { - Ok(request) => request, - Err(_) => { - let global_root = ws_root.global.root(); - let address = Trusted::new(global_root.r().get_cx(), ws_root, global_root.r().script_chan().clone()); - let task = box WebSocketTaskHandler::new(address, WebSocketTask::Close); - global_root.r().script_chan().send(ScriptMsg::RunnableMsg(task)).unwrap(); - return Ok(Temporary::from_rooted(ws_root)); - } - }; + let request = Client::connect(parsed_url).unwrap(); let response = request.send().unwrap(); response.validate().unwrap(); ws_root.ready_state.set(WebSocketRequestState::Open); |