From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 17 Jul 2011 19:16:30 +0000 (+0200)
Subject: Fix an exception when connecting with an unsupported WebSocket version.
X-Git-Tag: v2.1.0~78^2~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc74565a05f0de8d89d5c0cd6cc22a9e4fb15796;p=thirdparty%2Ftornado.git

Fix an exception when connecting with an unsupported WebSocket version.
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 00da861c4..f23da07a2 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -70,6 +70,7 @@ class WebSocketHandler(tornado.web.RequestHandler):
         tornado.web.RequestHandler.__init__(self, application, request,
                                             **kwargs)
         self.stream = request.connection.stream
+        self.ws_connection = None
 
     def _execute(self, transforms, *args, **kwargs):
         self.open_args = args
@@ -127,8 +128,9 @@ class WebSocketHandler(tornado.web.RequestHandler):
         raise Exception("Method not supported for Web Sockets")
 
     def on_connection_close(self):
-        self.ws_connection.client_terminated = True
-        self.on_close()
+        if self.ws_connection:
+            self.ws_connection.client_terminated = True
+            self.on_close()
 
     def _set_client_terminated(self, value):
         self.ws_connection.client_terminated = value