Skip to content

Commit

Permalink
[fix] Properly close the connection on error (socketio#2681)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Atkinson authored and darrachequesne committed Jan 16, 2017
1 parent 6d4b58b commit 31f5c84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Client.prototype.onerror = function(err){
this.sockets[id].onerror(err);
}
}
this.onclose('client error');
this.conn.close();
};

/**
Expand Down
10 changes: 5 additions & 5 deletions test/socket.io.js
Original file line number Diff line number Diff line change
Expand Up @@ -981,12 +981,12 @@ describe('socket.io', function(){
var srv = http();
var sio = io(srv);
srv.listen(function(){
var socket = client(srv);
var socket = client(srv, { reconnection: false });
sio.on('connection', function(s){
s.on('error', function(err){
expect(err).to.be.an(Error);
s.on('disconnect', function(reason){
expect(reason).to.be('client error');
expect(reason).to.be('forced close');
done();
});
});
Expand Down Expand Up @@ -1686,7 +1686,7 @@ describe('socket.io', function(){
var srv = http();
var sio = io(srv);
srv.listen(function(){
var socket = client(srv);
var socket = client(srv, { reconnection: false });
sio.on('connection', function(s){
s.conn.on('upgrade', function(){
console.log('\033[96mNote: warning expected and normal in test.\033[39m');
Expand All @@ -1703,7 +1703,7 @@ describe('socket.io', function(){
var srv = http();
var sio = io(srv);
srv.listen(function(){
var socket = client(srv);
var socket = client(srv, { reconnection: false });
sio.on('connection', function(s){
s.once('error', function(err){
expect(err.message).to.match(/Illegal attachments/);
Expand All @@ -1720,7 +1720,7 @@ describe('socket.io', function(){
var srv = http();
var sio = io(srv);
srv.listen(function(){
var socket = client(srv);
var socket = client(srv, { reconnection: false });
sio.on('connection', function(s){
s.once('error', function(err){
expect(err.message).to.match(/Illegal attachments/);
Expand Down

0 comments on commit 31f5c84

Please sign in to comment.