From d33091d76bcdd0808a3d45b7ff102be456a57553 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 16 Oct 2014 15:58:57 -0500 Subject: [PATCH] added ssl option for tornado, thanks dmvieira --- VERSION | 2 +- gluon/contrib/websocket_messaging.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 6126c887..ce54ce20 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.10.0-beta+timestamp.2014.09.24.13.35.58 +Version 2.10.0-beta+timestamp.2014.10.16.15.58.50 diff --git a/gluon/contrib/websocket_messaging.py b/gluon/contrib/websocket_messaging.py index c763098c..89a90897 100644 --- a/gluon/contrib/websocket_messaging.py +++ b/gluon/contrib/websocket_messaging.py @@ -143,6 +143,7 @@ class TokenHandler(tornado.web.RequestHandler): self.send_error(401) tokens[message] = None + class DistributeHandler(tornado.websocket.WebSocketHandler): def open(self, params): group, token, name = params.split('/') + [None, None] @@ -176,12 +177,11 @@ class DistributeHandler(tornado.websocket.WebSocketHandler): client.write_message('-' + self.name) print '%s:DISCONNECT from %s' % (time.time(), self.group) - #if your webserver is different from tornado server uncomment this - #or override using something more restrictive: - #http://tornado.readthedocs.org/en/latest/websocket.html#tornado.websocket.WebSocketHandler.check_origin - #def check_origin(self, origin): - # return True - +# if your webserver is different from tornado server uncomment this +# or override using something more restrictive: +# http://tornado.readthedocs.org/en/latest/websocket.html#tornado.websocket.WebSocketHandler.check_origin +# def check_origin(self, origin): +# return True if __name__ == "__main__": usage = __doc__