fixed conflicts

This commit is contained in:
psychobunny
2013-04-24 21:19:04 +00:00
5 changed files with 39 additions and 7 deletions

View File

@@ -15,7 +15,7 @@ var SocketIO = require('socket.io').listen(global.server),
io.set('authorization', function(handshakeData, accept) {
if (handshakeData.headers.cookie) {
handshakeData.cookie = cookie.parse(handshakeData.headers.cookie);
handshakeData.sessionID = connect.utils.parseSignedCookie(handshakeData.cookie['express.sid'], 'nodebb-julian');
handshakeData.sessionID = connect.utils.parseSignedCookie(handshakeData.cookie['express.sid'], 'nodebb');
if (handshakeData.cookie['express.sid'] == handshakeData.sessionID) {
return accept('Cookie is invalid.', false);