Merge commit '342faf219793fc5c1f130fc33e3fb5422dab516d'

Author: rauchg

History.md

@@ -1,4 +1,20 @@
 
+1.3.5 / 2015-03-03
+==================
+
+ * package: bump `socket.io-parser`
+
+1.3.4 / 2015-02-14
+==================
+
+ * package: bump `socket.io-client`
+
+1.3.3 / 2015-02-03
+==================
+
+ * socket: warn node_redis-style about missing `error`
+ * package: bump parser to better handle bad binary packets
+
 1.3.2 / 2015-01-19
 ==================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "engine.io": "automattic/engine.io#ab2bd0",
-    "socket.io-parser": "2.2.3",
+    "socket.io-parser": "2.2.4",
     "socket.io-client": "automattic/socket.io-client#e89816",
     "socket.io-adapter": "automattic/socket.io-adapter#de5cba",
     "has-binary": "0.1.6",

test/socket.io.js

@@ -1567,13 +1567,13 @@ describe('socket.io', function(){
       var srv = http();
       var sio = io(srv);
       srv.listen(function(){
-        var socket = client(srv);
-        sio.on('connection', function(s){
+        var socket = client(srv, '/chat');
+        sio.of('/chat').on('connection', function(s){
           s.conn.once('packetCreate', function(packet) {
             expect(packet.options.compress).to.be(true);
             done();
           });
-          s.emit('woot', 'hi');
+          sio.of('/chat').emit('woot', 'hi');
         });
       });
     });
@@ -1582,13 +1582,13 @@ describe('socket.io', function(){
       var srv = http();
       var sio = io(srv);
       srv.listen(function(){
-        var socket = client(srv);
-        sio.on('connection', function(s){
+        var socket = client(srv, '/chat');
+        sio.of('/chat').on('connection', function(s){
           s.conn.once('packetCreate', function(packet) {
             expect(packet.options.compress).to.be(false);
             done();
           });
-          s.compress(false).emit('woot', 'hi');
+          sio.of('/chat').compress(false).emit('woot', 'hi');
         });
       });
     });
@@ -1626,6 +1626,23 @@ describe('socket.io', function(){
         });
       });
     });
+
+    it('should handle empty binary packet', function(done){
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv);
+        sio.on('connection', function(s){
+          s.once('error', function(err){
+            expect(err.message).to.match(/Illegal attachments/);
+            done();
+          });
+          s.conn.on('upgrade', function(){
+            socket.io.engine.write('5');
+          });
+        });
+      });
+    });
   });
 
   describe('messaging many', function(){