Removed unnecessary code

through a different socket. In this case we still want to clear the FD but not call
onDisconnect immediately.

History.md

@@ -1,4 +1,18 @@
 
+0.6.7 / 2011-01-09 
+==================
+
+  * Fixed situation where the connection drops but the client can still autoreconnect
+    through a different socket. In this case we still want to clear the FD but not
+    call onDisconnect immediately.
+
+0.6.6 / 2011-01-09 
+==================
+
+  * Note for Flash socket and inline policy on Firefox
+  * Destroy the fds on disconnect
+  * Restored 20 secs of polling so that node doesn't timeout the connections
+
 0.6.5 / 2011-01-09 
 ==================
 

lib/socket.io/client.js

@@ -69,6 +69,8 @@ Client.prototype._onConnect = function(req, res){
 
   this.connection.addListener('end', function(){
     self._onClose();
+    self.connection.destroy();
+    self.connection = null;
   });
   
   if (req){
@@ -145,10 +147,6 @@ Client.prototype._onClose = function(skipDisconnect){
 Client.prototype._onDisconnect = function(){
   if (this._open) this._onClose(true);
   if (this._disconnectTimeout) clearTimeout(this._disconnectTimeout);
-  if (this.connection){
-    this.connection.end();
-    this.connection = null;
-  }
   this._writeQueue = [];
   this.connected = false;
   if (this.handshaked){

lib/socket.io/transports/flashsocket.js

@@ -42,10 +42,11 @@ Flashsocket.init = function(listener){
       netserver.listen(843);
     } catch(e){
       if (e.errno == 13)
-        listener.options.log('Your node instance does not have root privileges.' 
+        listener.options.log('Your node instance does not have root privileges. ' 
                            + 'This means that the flash XML policy file will be '
                            + 'served inline instead of on port 843. This will slow '
-                           + 'down initial connections slightly.');
+                           + 'down initial connections slightly. NOTE: this fails '
+                           + 'with Firefox 4 betas.');
       netserver = null;
     }
   }

lib/socket.io/transports/xhr-polling.js

@@ -12,13 +12,12 @@ Polling.prototype.getOptions = function(){
   return {
     timeout: null, // no heartbeats
     closeTimeout: 8000,
-    duration: 50000
+    duration: 20000
   };
 };
 
 Polling.prototype._onConnect = function(req, res){
   var self = this, body = '';
-
   switch (req.method){
     case 'GET':
       Client.prototype._onConnect.apply(this, [req, res]);

package.json

@@ -1,6 +1,6 @@
 { "name" : "socket.io"
 , "description" : "The cross-browser WebSocket"
-, "version" : "0.6.5"
+, "version" : "0.6.7"
 , "author" : "LearnBoost"
 , "licenses" :
   [ { "type" : "MIT"