Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -796,8 +796,13 @@ Manager.prototype.handleHandshake = function (data, req, res) {
if (err) return error(err);

if (authorized) {
var id = self.generateId()
, hs = [
var id = self.generateId();

if((typeof data.query !== 'undefined') && (typeof data.query.sessionid !== 'undefined')){
id = data.query.sessionid;
}

var hs = [
id
, self.enabled('heartbeats') ? self.get('heartbeat timeout') || '' : ''
, self.get('close timeout') || ''
Expand Down
15 changes: 15 additions & 0 deletions test/manager.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,21 @@ module.exports = {
});
},

'test handshake with provided sessionid': function(done){
var port = ++ports
, io = sio.listen(port)
, cl = client(port);

cl.get('/socket.io/{protocol}/?sessionid=1234', function (res, data) {
res.statusCode.should.eql(200);
data.should.match(/1234:([0-9]+)?:([0-9]+)?:(.+)/);

cl.end();
io.server.close();
done();
});
},

'test handshake with unsupported protocol version': function (done) {
var port = ++ports
, io = sio.listen(port)
Expand Down