andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http: Guard against double close of WebSocket

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-08-30 00:25:43 +02:00
parent f1096d332c
commit 83e779eaaf
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -32,6 +32,9 @@ Bug fix release.
constant for use by implementors of :method:`mopidy.local.Library.browse`. constant for use by implementors of :method:`mopidy.local.Library.browse`.
(Related to: :issue:`833`) (Related to: :issue:`833`)
- HTTP frontend: Guard against double close of WebSocket, which causes an
:exc:`AttributeError` on Tornado < 3.2.
v0.19.3 (2014-08-03) v0.19.3 (2014-08-03)
==================== ====================

5
mopidy/http/handlers.py
View File

@ -110,7 +110,10 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
self.request.remote_ip, response) self.request.remote_ip, response)
except Exception as e: except Exception as e:
logger.error('WebSocket request error: %s', e) logger.error('WebSocket request error: %s', e)
self.close() if self.ws_connection:
# Tornado 3.2+ checks if self.ws_connection is None before
# using it, but not older versions.
self.close()
def check_origin(self, origin): def check_origin(self, origin):
# Allow cross-origin WebSocket connections, like Tornado before 4.0 # Allow cross-origin WebSocket connections, like Tornado before 4.0