From 0687800b5eb5b1d558a4bbceb6347a0b3693ba98 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Tue, 25 Jan 2011 12:15:37 -0800 Subject: [PATCH] Use request.uri instead of request.path in websocket handshake. Closes #208. --- tornado/websocket.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tornado/websocket.py b/tornado/websocket.py index 8258ea270..8e4308765 100644 --- a/tornado/websocket.py +++ b/tornado/websocket.py @@ -92,12 +92,12 @@ class WebSocketHandler(tornado.web.RequestHandler): "Connection: Upgrade\r\n" "Server: TornadoServer/%(version)s\r\n" "Sec-WebSocket-Origin: %(origin)s\r\n" - "Sec-WebSocket-Location: %(scheme)s://%(host)s%(path)s\r\n\r\n" % (dict( + "Sec-WebSocket-Location: %(scheme)s://%(host)s%(uri)s\r\n\r\n" % (dict( version=tornado.version, origin=self.request.headers["Origin"], scheme=scheme, host=self.request.host, - path=self.request.path))) + uri=self.request.uri))) self.stream.read_bytes(8, self._handle_challenge) def _handle_challenge(self, challenge): -- 2.47.2