Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix websocket after string type changes introduced by python3 merge

This commit is contained in:
Ben Darnell 2011-05-17 23:13:36 -07:00
parent d9648660ac
commit c5b5a6ad1b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tornado/websocket.py
View File

@ -87,7 +87,7 @@ class WebSocketHandler(tornado.web.RequestHandler):
# This is necessary when using proxies (such as HAProxy), which # This is necessary when using proxies (such as HAProxy), which
# need to see the Upgrade headers before passing through the # need to see the Upgrade headers before passing through the
# non-HTTP traffic that follows. # non-HTTP traffic that follows.
self.stream.write( self.stream.write(tornado.escape.utf8(
"HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
"Upgrade: WebSocket\r\n" "Upgrade: WebSocket\r\n"
"Connection: Upgrade\r\n" "Connection: Upgrade\r\n"
@ -98,7 +98,7 @@ class WebSocketHandler(tornado.web.RequestHandler):
origin=self.request.headers["Origin"], origin=self.request.headers["Origin"],
scheme=scheme, scheme=scheme,
host=self.request.host, host=self.request.host,
uri=self.request.uri))) uri=self.request.uri))))
self.stream.read_bytes(8, self._handle_challenge) self.stream.read_bytes(8, self._handle_challenge)
def _handle_challenge(self, challenge): def _handle_challenge(self, challenge):
@ -259,9 +259,10 @@ class WebSocketRequest(object):
"""Processes the key headers and calculates their key value. """Processes the key headers and calculates their key value.
Raises ValueError when feed invalid key.""" Raises ValueError when feed invalid key."""
number, spaces = filter(str.isdigit, key), filter(str.isspace, key) number = int(''.join(c for c in key if c.isdigit()))
spaces = len([c for c in key if c.isspace()])
try: try:
key_number = int(number) / len(spaces) key_number = number / spaces
except (ValueError, ZeroDivisionError): except (ValueError, ZeroDivisionError):
raise ValueError raise ValueError
return struct.pack(">I", key_number) return struct.pack(">I", key_number)