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

Auto merge of #8825 - jmr0:master, r=jdm

Browse source 
adding initial support for websocket subprotocol negotation

Addresses #8177

I also noticed some bugs/gaps (and at least one of my TODO's can be an E-Easy)

cc @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8825)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-18 05:23:15 +05:30
commit 63923bc7c9
12 changed files with 87 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/wpt/metadata/html/dom/interfaces.html.ini
View file

@ -7833,9 +7833,6 @@
[WebSocket interface: attribute extensions]
expected: FAIL
[WebSocket interface: attribute protocol]
expected: FAIL
[CloseEvent interface: existence and properties of interface object]
expected: FAIL

10
tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm.ini → tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.htm.ini
View file

@ -1,9 +1,9 @@
[Create-Secure-valid-url-protocol-setCorrectly.htm]
[Create-Secure-valid-url-array-protocols.htm]
type: testharness
expected: TIMEOUT
[W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened]
expected: FAIL
[W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed]
[W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened]
expected: NOTRUN
[W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed]
expected: FAIL

9
tests/wpt/metadata/websockets/Create-valid-url-array-protocols.htm.ini Normal file
View file

@ -0,0 +1,9 @@
[Create-valid-url-array-protocols.htm]
type: testharness
expected: TIMEOUT
[W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened]
expected: NOTRUN
[W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed]
expected: FAIL

5
tests/wpt/metadata/websockets/Create-valid-url-protocol-empty.htm.ini
View file

@ -1,5 +0,0 @@
[Create-valid-url-protocol-empty.htm]
type: testharness
[W3C WebSocket API - Create WebSocket - wsocket.protocol should be empty before connection is established]
expected: FAIL

6
tests/wpt/metadata/websockets/constructor/009.html.ini
View file

@ -1,6 +0,0 @@
[009.html]
type: testharness
expected: TIMEOUT
[WebSockets: protocol]
expected: TIMEOUT

6
tests/wpt/metadata/websockets/constructor/012.html.ini
View file

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

6
tests/wpt/metadata/websockets/interfaces.html.ini
View file

@ -9,18 +9,12 @@
[WebSocket interface: attribute extensions]
expected: FAIL
[WebSocket interface: attribute protocol]
expected: FAIL
[Stringification of new WebSocket("ws://foo")]
expected: FAIL
[WebSocket interface: new WebSocket("ws://foo") must inherit property "extensions" with the proper type (10)]
expected: FAIL
[WebSocket interface: new WebSocket("ws://foo") must inherit property "protocol" with the proper type (11)]
expected: FAIL
[CloseEvent interface: existence and properties of interface object]
expected: FAIL

5
tests/wpt/metadata/websockets/interfaces/WebSocket/protocol/protocol-initial.html.ini
View file

@ -1,5 +0,0 @@
[protocol-initial.html]
type: testharness
[WebSockets: getting protocol in connecting]
expected: FAIL