зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #6353 - Revert "WebSocket constructor should not panic" (from servo:revert); r=Ms2ger
This reverts commit 877c369e0bc5db4286457be36d015eeb1f0ae2f2. Source-Repo: https://github.com/servo/servo Source-Revision: 85d839fb5c6ff023897828b0873caa8972842969
This commit is contained in:
Родитель
fb5908901f
Коммит
3e4e83073b
|
@ -141,16 +141,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(parsed_url) {
|
let request = Client::connect(parsed_url).unwrap();
|
||||||
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 response = request.send().unwrap();
|
let response = request.send().unwrap();
|
||||||
response.validate().unwrap();
|
response.validate().unwrap();
|
||||||
ws_root.ready_state.set(WebSocketRequestState::Open);
|
ws_root.ready_state.set(WebSocketRequestState::Open);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче