Auto merge of #9360 - jsanders:accept-protocols-sequence, r=KiChjang

Accept WebSocket protocols as string or sequence

Fixes #9053

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9360)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-19 02:18:28 +05:30
commit 03a0b73538
6 changed files with 10 additions and 36 deletions

View file

@ -1,9 +0,0 @@
[Create-Secure-valid-url-array-protocols.htm]
type: testharness
expected: TIMEOUT
[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

View file

@ -1,5 +0,0 @@
[Create-protocols-repeated.htm]
type: testharness
[W3C WebSocket API - Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values - SYNTAX_ERR is thrown]
expected: FAIL

View file

@ -1,9 +0,0 @@
[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

View file

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