Merge pull request #1286 from vovanec/patch-1

Added support for custom web socket protocols.

diff --cc tornado/websocket.py
index 5c1bab4e3bbc9097e80b2a6178ef4fb57d735db3,9868f8975ddd755969f34140572e27c147764d5a..6051e82fbfef560ad7c5efa897b7b095befe7405
--- 1/tornado/websocket.py
--- 2/tornado/websocket.py
+++ b/tornado/websocket.py
@@@ -180,10 -178,9 +179,9 @@@ class WebSocketHandler(tornado.web.Requ
              if not self.stream.closed():
                  self.stream.write(tornado.escape.utf8(
                      "HTTP/1.1 426 Upgrade Required\r\n"
 -                    "Sec-WebSocket-Version: 8\r\n\r\n"))
 +                    "Sec-WebSocket-Version: 7, 8, 13\r\n\r\n"))
                  self.stream.close()
  
- 
      def write_message(self, message, binary=False):
          """Sends the given message to the client of this Web Socket.