From e2649975d2629c6dda43a24009604abf544c801c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 28 Jul 2016 15:35:15 +0530 Subject: [PATCH] [fix] use currentsite.txt only if host is localhost --- socketio.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/socketio.js b/socketio.js index a2f7251e85..316b7f73d9 100644 --- a/socketio.js +++ b/socketio.js @@ -171,12 +171,14 @@ function get_task_room(socket, task_id) { } function get_site_name(socket) { - if (conf.default_site) { - return conf.default_site; - } - else if (socket.request.headers['x-frappe-site-name']) { + if (socket.request.headers['x-frappe-site-name']) { return get_hostname(socket.request.headers['x-frappe-site-name']); } + else if (['localhost', '127.0.0.1'].indexOf(socket.request.headers.host) !== -1 + && conf.default_site) { + // from currentsite.txt since host is localhost + return conf.default_site; + } else if (socket.request.headers.origin) { return get_hostname(socket.request.headers.origin); }