Changed behavior of end and close events, and introduced `swapped…

…` semaphore.

lib/transport.js

@@ -73,13 +73,15 @@ Transport.prototype.handleRequest = function (req) {
     this.socket = req.socket;
     this.open = true;
     this.drained = true;
+    this.swapped = false;
 
     var self = this;
 
     this.log.debug('publishing that', this.id, 'connected');
     this.store.publish('open:' + this.id, function () {
       self.store.once('open:' + self.id, function () {
         self.log.debug('request for existing session connection change');
+        self.swapped = true;
         self.close();
         self.clearTimeouts();
       });
@@ -112,7 +114,7 @@ Transport.prototype.handleRequest = function (req) {
     if (!req.socket.__ioHandler) {
       // add a handler only once per socket
       this.socket.on('end', this.onSocketEnd.bind(this));
-      this.socket.on('close', this.onSocketEnd.bind(this));
+      this.socket.on('close', this.onSocketClose.bind(this));
       this.socket.on('error', this.onSocketError.bind(this));
       this.socket.on('drain', this.onSocketDrain.bind(this));
 
@@ -137,7 +139,24 @@ Transport.prototype.onSocketConnect = function () { };
  */
 
 Transport.prototype.onSocketEnd = function () {
-  this.close();
+  // we check that the socket wasn't swapped
+  // we don't want to sever a connection that's not active, since we don't kill
+  // inactive sockets that the browser might reuse for other purposes
+  if (!this.swapped) {
+    this.end(false, 'socket end');
+  }
+};
+
+/**
+ * Called when the connection dies
+ *
+ * @api private
+ */
+
+Transport.prototype.onSocketClose = function (error) {
+  if (!this.swapped) {
+    this.end(false, error ? 'socket error' : 'socket close');
+  }
 };
 
 /**