From 1c4bed6d2c6904bedb912f169eaf84b44894b362 Mon Sep 17 00:00:00 2001 From: Bryce Kahle Date: Thu, 23 Oct 2014 12:18:51 -0400 Subject: [PATCH] Use faye for websocket request checks. No need to duplicate them. --- src/trans-websocket.coffee | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/trans-websocket.coffee b/src/trans-websocket.coffee index fbde4941..1514c623 100644 --- a/src/trans-websocket.coffee +++ b/src/trans-websocket.coffee @@ -12,18 +12,10 @@ transport = require('./transport') exports.app = _websocket_check: (req, connection, head) -> - # Request via node.js magical 'upgrade' event. - if (req.headers.upgrade || '').toLowerCase() isnt 'websocket' + if not FayeWebsocket.isWebSocket(req) throw { status: 400 - message: 'Can "Upgrade" only to "WebSocket".' - } - conn = (req.headers.connection || '').toLowerCase() - - if (conn.split(/, */)).indexOf('upgrade') is -1 - throw { - status: 400 - message: '"Connection" must be "Upgrade".' + message: 'Not a valid websocket request' } sockjs_websocket: (req, connection, head) ->