mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Revert "WebSocket constructor should not panic"
This reverts commit 877c369e0b
.
This commit is contained in:
parent
c8f322b267
commit
230c4201f3
25 changed files with 41 additions and 557 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue