Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Minimum support for hybi13 #22

Merged
merged 1 commit into from

2 participants

@stephank

Chrome Canary builds are now using websocket protocol version 13, from draft-ietf-hybi-thewebsocketprotocol-17. This commit basically matches the work done in the related WebKit commit and pywebsocket commit.

@majek majek merged commit 653a38d into from
@majek
Owner

Applied, Thanks. We should also make sure that the handling of Origin header is correct.

@stephank

I was wondering about that. I'm no expert, but...

  • draft-hixie-thewebsocketprotocol-76 has a request header named Origin.
  • draft-ietf-hybi-thewebsocketprotocol-10 has a request header named Sec-WebSocket-Origin
  • draft-ietf-hybi-thewebsocketprotocol-17 has a request header named Origin

So it looks like we're only wrong for draft hybi 10, but I don't know about the intermediate drafts, and if they're in use at all.

On top of that, draft hixie 76 had a response header Sec-WebSocket-Origin as well, which seems to have be removed completely in the other two drafts.

@majek
Owner

Is hybi-17 in chrome 15?

@stephank

Nope. Current Canary will be Chrome 16.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 18, 2011
  1. @stephank

    Minimum support for hybi13

    stephank authored
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  src/trans-websocket.coffee
View
2  src/trans-websocket.coffee
@@ -27,7 +27,7 @@ exports.app =
location += '://' + req.headers.host + req.url
ver = req.headers['sec-websocket-version']
- if ver is '8' or ver is '7'
+ if ver in ['7', '8', '13']
new websocket_hybi10.WebHandshake8(@, req, connection, head or '', origin, location)
else
new websocket_hixie76.WebHandshakeHixie76(@, req, connection, head or '', origin, location)
Something went wrong with that request. Please try again.