Merge branch 'dev' into test

28a01ceb · ibuler · 368d12b7 · 16d05a3c · 28a01ceb
Commit 28a01ceb authored Jan 23, 2018 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

httpd.py coco/httpd.py +3 -2

No files found.
--- a/coco/httpd.py
+++ b/coco/httpd.py
@@ -26,8 +26,9 @@ class BaseWebSocketHandler:
    def prepare(self, request):
        # self.app = self.settings["app"]
-        if request.headers.getlist("X-Forwarded-For"):
+        x_forwarded_for = request.headers.getlist("X-Forwarded-For").split(',')
-            remote_ip = request.headers.getlist("X-Forwarded-For")[0]
+        if x_forwarded_for and x_forwarded_for[0]:
+            remote_ip = x_forwarded_for[0]
        else:
            remote_ip = request.remote_addr
        self.clients[request.sid]["request"] = Request((remote_ip, 0))