Auto merge of #6611 - jdm:websocketorigin, r=jdm

Add Origin header to WebSocket connections.

Closes #6532.

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

components/script/dom/websocket.rs

@@ -32,6 +32,7 @@ use websocket::client::receiver::Receiver;
 use websocket::stream::WebSocketStream;
 use websocket::client::request::Url;
 use websocket::Client;
+use websocket::header::Origin;
 
 #[derive(JSTraceable, PartialEq, Copy, Clone)]
 enum WebSocketRequestState {
@@ -139,7 +140,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(url) {
+        let mut request = match Client::connect(url) {
             Ok(request) => request,
             Err(_) => {
                 let global_root = ws.r().global.root();
@@ -149,6 +150,7 @@ impl WebSocket {
                 return Ok(ws);
             }
         };
+        request.headers.set(Origin(global.get_url().serialize()));
         let response = request.send().unwrap();
         response.validate().unwrap();
 

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

@@ -1,3 +1,6 @@
 [010.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
+  [WebSockets: protocol in response but no requested protocol]
+    expected: TIMEOUT
+

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

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

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

@@ -1,3 +1,6 @@
 [012.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
+  [WebSockets: no protocol in response]
+    expected: TIMEOUT
+

tests/wpt/metadata/websockets/cookies/002.html.ini

@@ -1,3 +1,5 @@
 [002.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: Set-Cookie in response]
+    expected: FAIL
+

tests/wpt/metadata/websockets/cookies/004.html.ini

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

tests/wpt/metadata/websockets/cookies/005.html.ini

@@ -1,3 +1,6 @@
 [005.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
+  [WebSockets: setting HttpOnly cookies in ws response, checking ws request]
+    expected: TIMEOUT
+

tests/wpt/metadata/websockets/cookies/007.html.ini

@@ -1,3 +1,5 @@
 [007.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: when to process set-cookie fields in ws response]
+    expected: FAIL
+

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

@@ -1,3 +1,6 @@
 [005.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
+  [WebSockets: proper first line]
+    expected: TIMEOUT
+