From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 25 Jan 2011 20:15:37 +0000 (-0800)
Subject: Use request.uri instead of request.path in websocket handshake.
X-Git-Tag: v1.2.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0687800b5eb5b1d558a4bbceb6347a0b3693ba98;p=thirdparty%2Ftornado.git

Use request.uri instead of request.path in websocket handshake.

Closes #208.
---

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):