Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6397 - servo:ws-connect, r=Ms2ger

Browse source 
Make an early return when the WebSocket connection fails in the constructor.
Also let the WebSocket connection to be closed when the connection could
not be established.

Fixes #6082.
This commit is contained in:
bors-servo 2015-06-16 01:47:10 -06:00
commit a5d76e4b2c
15 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/websocket.rs
View file

@ -141,7 +141,16 @@ 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 = Client::connect(parsed_url).unwrap(); 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 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);

3
tests/wpt/metadata/FileAPI/progress.html.ini
View file

@ -1,3 +1,6 @@
[progress.html] [progress.html]
type: testharness type: testharness
expected: TIMEOUT expected: TIMEOUT
[W3C WebSocket API - Create WebSocket - Pass a URL with a non ws/wss scheme - SYNTAX_ERR is thrown]
expected: FAIL

4
tests/wpt/metadata/websockets/Create-Secure-blocked-port.htm.ini
View file

@ -1,3 +1,5 @@
[Create-Secure-blocked-port.htm] [Create-Secure-blocked-port.htm]
type: testharness type: testharness
expected: CRASH [W3C WebSocket API - Create Secure WebSocket - Pass a URL with a blocked port - SECURITY_ERR should be thrown]
expected: FAIL

3
tests/wpt/metadata/websockets/constructor/008.html.ini
View file

@ -1,3 +0,0 @@
[008.html]
type: testharness
expected: CRASH

3
tests/wpt/metadata/websockets/constructor/017.html.ini
View file

@ -1,3 +0,0 @@
[017.html]
type: testharness
expected: CRASH

4
tests/wpt/metadata/websockets/constructor/021.html.ini
View file

@ -1,3 +1,5 @@
[021.html] [021.html]
type: testharness type: testharness
expected: CRASH [WebSockets: Same sub protocol twice]
expected: FAIL

3
tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html.ini
View file

@ -1,3 +0,0 @@
[bufferedAmount-defineProperty-getter.html]
type: testharness
expected: CRASH

3
tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html.ini
View file

@ -1,3 +0,0 @@
[bufferedAmount-defineProperty-setter.html]
type: testharness
expected: CRASH

5
tests/wpt/metadata/websockets/interfaces/WebSocket/events/020.html.ini
View file

@ -1,3 +1,6 @@
[020.html] [020.html]
type: testharness type: testharness
expected: CRASH expected: TIMEOUT
[WebSockets: error events]
expected: TIMEOUT

3
tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/004.html.ini
View file

@ -1,3 +0,0 @@
[004.html]
type: testharness
expected: CRASH

3
tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/005.html.ini
View file

@ -1,3 +0,0 @@
[005.html]
type: testharness
expected: CRASH

3
tests/wpt/metadata/websockets/interfaces/WebSocket/url/005.html.ini
View file

@ -1,3 +0,0 @@
[005.html]
type: testharness
expected: CRASH

3
tests/wpt/metadata/websockets/interfaces/WebSocket/url/006.html.ini
View file

@ -1,3 +0,0 @@
[006.html]
type: testharness
expected: CRASH

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -539,6 +539,12 @@
"url": "/_mozilla/mozilla/union.html" "url": "/_mozilla/mozilla/union.html"
} }
], ],
"mozilla/websocket_connection_fail.html": [
{
"path": "mozilla/websocket_connection_fail.html",
"url": "/_mozilla/mozilla/websocket_connection_fail.html"
}
],
"mozilla/window.html": [ "mozilla/window.html": [
{ {
"path": "mozilla/window.html", "path": "mozilla/window.html",

19
tests/wpt/mozilla/tests/mozilla/websocket_connection_fail.html Normal file
View file

@ -0,0 +1,19 @@
<html>
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
async_test(function() {
var onclose = 0;
var ws = new WebSocket("ws://wrong_url");
ws.onclose = this.step_func_done(function(ev) {
onclose++;
assert_equals(onclose, 1);
});
});
</script>
</body>
</html>