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

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

View file

@ -22,7 +22,7 @@ interface WebSocket : EventTarget {
attribute EventHandler onerror;
attribute EventHandler onclose;
//readonly attribute DOMString extensions;
//readonly attribute DOMString protocol;
readonly attribute DOMString protocol;
[Throws] void close([Clamp] optional unsigned short code, optional USVString reason);
//messaging