Merge pull request #351 from nkzawa/patch-6

wait for buffer to be drained before closing

Author: rauchg

lib/socket.js

@@ -586,7 +586,9 @@ Socket.prototype.close = function () {
       close();
     }
 
-    if (this.upgrading) {
+    if (this.writeBuffer.length) {
+      this.once('drain', close);
+    } else if (this.upgrading) {
       // wait for upgrade to finish since we can't send packets while pausing a transport
       this.once('upgrade', cleanupAndClose);
       this.once('upgradeError', cleanupAndClose);

test/connection.js

@@ -143,5 +143,18 @@ describe('connection', function() {
         }, 1200);
       });
     });
+
+    it('should send all buffered packets if closing is deferred', function(done) {
+      var socket = new eio.Socket();
+      socket.on('open', function() {
+        socket.on('upgrading', function() {
+          socket.send('hi');
+          socket.close();
+        }).on('close', function() {
+          expect(socket.writeBuffer).to.have.length(0);
+          done();
+        });
+      });
+    });
   }
 });