Commit abb20e1a authored by ibuler's avatar ibuler

Merge branch 'dev' into test

parents 28a01ceb 7864f237
...@@ -26,7 +26,7 @@ class BaseWebSocketHandler: ...@@ -26,7 +26,7 @@ class BaseWebSocketHandler:
def prepare(self, request): def prepare(self, request):
# self.app = self.settings["app"] # self.app = self.settings["app"]
x_forwarded_for = request.headers.getlist("X-Forwarded-For").split(',') x_forwarded_for = request.headers.get("X-Forwarded-For", '').split(',')
if x_forwarded_for and x_forwarded_for[0]: if x_forwarded_for and x_forwarded_for[0]:
remote_ip = x_forwarded_for[0] remote_ip = x_forwarded_for[0]
else: else:
......
...@@ -138,7 +138,7 @@ class Server: ...@@ -138,7 +138,7 @@ class Server:
logger.info("Closed server {}".format(self)) logger.info("Closed server {}".format(self))
self.chan.close() self.chan.close()
self.stop_evt.set() self.stop_evt.set()
self.chan.transport.close() self.chan.close()
@staticmethod @staticmethod
def _have_enter_char(s): def _have_enter_char(s):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment