Auto merge of #6620 - Ms2ger:ws-crash, r=jdm

Stop panicking while establishing a WebSocket connection.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6620)
<!-- Reviewable:end -->

components/script/dom/websocket.rs

@@ -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
+        let channel = establish_a_websocket_connection(url, global.get_url().serialize());
-        // see https://github.com/cyderize/rust-websocket/issues/38
+        let (temp_sender, temp_receiver) = match channel {
-        let mut request = match Client::connect(url) {
+            Ok(channel) => channel,
-            Ok(request) => request,
+            Err(e) => {
-            Err(_) => {
+                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);
 

tests/wpt/metadata/websockets/constructor/022.html.ini

@@ -1,3 +1,6 @@
 [022.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
+  [WebSockets: protocol array]
+    expected: TIMEOUT
+

tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html.ini

@@ -1,3 +1,5 @@
 [bufferedAmount-initial.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: getting bufferedAmount]
+    expected: FAIL
+

tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html.ini

@@ -1,3 +1,5 @@
 [bufferedAmount-readonly.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: setting bufferedAmount]
+    expected: FAIL
+

tests/wpt/metadata/websockets/interfaces/WebSocket/close/close-connecting.html.ini

@@ -1,3 +1,5 @@
 [close-connecting.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: close() when connecting]
+    expected: FAIL
+

tests/wpt/metadata/websockets/interfaces/WebSocket/close/close-replace.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/constants/001.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/constants/002.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/constants/003.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/constants/004.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/events/001.html.ini

@@ -1,3 +1,5 @@
 [001.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: getting on* 1]
+    expected: FAIL
+

tests/wpt/metadata/websockets/interfaces/WebSocket/events/002.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/events/003.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/events/004.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/events/006.html.ini

@@ -1,3 +1,5 @@
 [006.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: 'on*' in ws]
+    expected: FAIL
+

tests/wpt/metadata/websockets/interfaces/WebSocket/events/007.html.ini

@@ -1,3 +1,5 @@
 [007.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: listening for events with onmessage]
+    expected: TIMEOUT
+

tests/wpt/metadata/websockets/interfaces/WebSocket/events/008.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/events/009.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/001.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/002.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/send/002.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/url/001.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/url/002.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/url/003.html.ini

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

tests/wpt/metadata/websockets/interfaces/WebSocket/url/004.html.ini

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

tests/wpt/metadata/websockets/opening-handshake/001.html.ini

@@ -1,3 +1,5 @@
 [001.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: invalid handshake]
+    expected: FAIL
+

tests/wpt/metadata/websockets/security/001.html.ini

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