James Coglan 48dfb9578c Merge branch 'master' into subprotocols ...

Conflicts:
	lib/faye/websocket.js
	lib/faye/websocket/protocol8_parser.js

2011-12-17 15:37:54 +00:00

..

autobahn_client.js

Don't skip any Autobahn tests since they run fast enough now.

2011-12-17 15:13:28 +00:00

client.js

Change example back to using onmessage.

2011-11-29 21:08:37 +00:00

haproxy.conf

Fix draft-76 sockets when running behind HAProxy.

2011-12-04 21:15:24 +00:00

index.html

Only send Sec-WebSocket-Protocol response if there is a matching protocol available.

2011-12-15 20:05:03 +00:00

server.js

Initial support for user-defined subprotocol negotiation on the server side.

2011-12-15 00:33:23 +00:00