Skip to content

Commit 2258a6a

Browse files
Tom Atkinsondarrachequesne
authored andcommitted
[fix] Properly close the connection on error (socketio#2681)
1 parent ad658b8 commit 2258a6a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Client.prototype.onerror = function(err){
216216
this.sockets[id].onerror(err);
217217
}
218218
}
219-
this.onclose('client error');
219+
this.conn.close();
220220
};
221221

222222
/**

test/socket.io.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -981,12 +981,12 @@ describe('socket.io', function(){
981981
var srv = http();
982982
var sio = io(srv);
983983
srv.listen(function(){
984-
var socket = client(srv);
984+
var socket = client(srv, { reconnection: false });
985985
sio.on('connection', function(s){
986986
s.on('error', function(err){
987987
expect(err).to.be.an(Error);
988988
s.on('disconnect', function(reason){
989-
expect(reason).to.be('client error');
989+
expect(reason).to.be('forced close');
990990
done();
991991
});
992992
});
@@ -1686,7 +1686,7 @@ describe('socket.io', function(){
16861686
var srv = http();
16871687
var sio = io(srv);
16881688
srv.listen(function(){
1689-
var socket = client(srv);
1689+
var socket = client(srv, { reconnection: false });
16901690
sio.on('connection', function(s){
16911691
s.conn.on('upgrade', function(){
16921692
console.log('\033[96mNote: warning expected and normal in test.\033[39m');
@@ -1703,7 +1703,7 @@ describe('socket.io', function(){
17031703
var srv = http();
17041704
var sio = io(srv);
17051705
srv.listen(function(){
1706-
var socket = client(srv);
1706+
var socket = client(srv, { reconnection: false });
17071707
sio.on('connection', function(s){
17081708
s.once('error', function(err){
17091709
expect(err.message).to.match(/Illegal attachments/);
@@ -1720,7 +1720,7 @@ describe('socket.io', function(){
17201720
var srv = http();
17211721
var sio = io(srv);
17221722
srv.listen(function(){
1723-
var socket = client(srv);
1723+
var socket = client(srv, { reconnection: false });
17241724
sio.on('connection', function(s){
17251725
s.once('error', function(err){
17261726
expect(err.message).to.match(/Illegal attachments/);

0 commit comments

Comments
 (0)