Release 0.6.5

Important fix for polling transports.

History.md

@@ -1,4 +1,17 @@
 
+0.6.5 / 2011-01-09 
+==================
+
+  * Make sure not to trigger multiple timeouts when closing
+  * Important fix for polling transports.
+
+0.6.4 / 2011-01-05 
+==================
+
+  * Don't destroy the connection in _onClose. Destroying it will prevent the buffers from being flushed and will result in corrupted responses for the xhr-polling transport.
+  * Added try/catch block around JSON.parse and return an empty object literal if JSON parsing fails.
+  * Added missing .connect() to example
+
 0.6.3 / 2010-12-23 
 ==================
 

README.md

@@ -59,6 +59,7 @@ On the client:
 	<script src="/socket.io/socket.io.js"></script>
 	<script>
 		var socket = new io.Socket();
+		socket.connect();
 		socket.on('connect', function(){ … })
 		socket.on('message', function(){ … })
 		socket.on('disconnect', function(){ … })

lib/socket.io/client.js

@@ -48,7 +48,11 @@ Client.prototype._onMessage = function(data){
       case '~h~':
         return this._onHeartbeat(messages[i].substr(3));
       case '~j~':
-        messages[i] = JSON.parse(messages[i].substr(3));
+        try {
+          messages[i] = JSON.parse(messages[i].substr(3));
+        } catch(e) {
+          messages[i] = {};
+        }
         break;
     }
     this.emit('message', messages[i]);
@@ -62,7 +66,7 @@ Client.prototype._onConnect = function(req, res){
   this.request = req;
   this.response = res;
   this.connection = req.connection;
-  
+
   this.connection.addListener('end', function(){
     self._onClose();
   });
@@ -121,15 +125,11 @@ Client.prototype._onHeartbeat = function(h){
 };
 
 Client.prototype._onClose = function(skipDisconnect){
+  if (!this._open) return this;
   var self = this;
   if (this._heartbeatInterval) clearTimeout(this._heartbeatInterval);
   if (this._heartbeatTimeout) clearTimeout(this._heartbeatTimeout);
   this._open = false;
-  if (this.connection){
-    this.connection.end();
-    this.connection.destroy();
-    this.connection = null;
-  }
   this.request = null;
   this.response = null;
   if (skipDisconnect !== false){
@@ -145,6 +145,10 @@ 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){

package.json

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