Skip to content

Commit 1c4bed6

Browse files
committed
Use faye for websocket request checks. No need to duplicate them.
1 parent 2843d15 commit 1c4bed6

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/trans-websocket.coffee

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@ transport = require('./transport')
1212

1313
exports.app =
1414
_websocket_check: (req, connection, head) ->
15-
# Request via node.js magical 'upgrade' event.
16-
if (req.headers.upgrade || '').toLowerCase() isnt 'websocket'
15+
if not FayeWebsocket.isWebSocket(req)
1716
throw {
1817
status: 400
19-
message: 'Can "Upgrade" only to "WebSocket".'
20-
}
21-
conn = (req.headers.connection || '').toLowerCase()
22-
23-
if (conn.split(/, */)).indexOf('upgrade') is -1
24-
throw {
25-
status: 400
26-
message: '"Connection" must be "Upgrade".'
18+
message: 'Not a valid websocket request'
2719
}
2820

2921
sockjs_websocket: (req, connection, head) ->

0 commit comments

Comments
 (0)