Merge branch 'master' into patch-7

Author: nkzawa

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "0.8"
   - "0.10"
   - "0.12"
+  - "4.0.0"
 
 notifications:
   irc: "irc.freenode.org#socket.io"

History.md

@@ -1,4 +1,14 @@
 
+1.5.4 / 2015-09-09
+==================
+
+  * package: bump `engine.io-parser`
+
+1.5.3 / 2015-09-09
+==================
+
+  * package: bump `ws` to fix node 4.0.0
+
 1.5.2 / 2015-07-09
 ==================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "The realtime engine behind Socket.IO. Provides the foundation of a bidirectional connection between client and server",
   "main": "./lib/engine.io",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
@@ -25,17 +25,17 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "debug": "2.1.3",
-    "ws": "0.7.2",
-    "engine.io-parser": "1.2.1",
     "base64id": "0.1.0",
+    "debug": "2.1.3",
+    "ws": "0.8.0",
+    "engine.io-parser": "1.2.2",
     "accepts": "1.1.4"
   },
   "devDependencies": {
     "mocha": "1.12.0",
     "expect.js": "0.2.0",
     "superagent": "0.15.4",
-    "engine.io-client": "socketio/engine.io-client#d010541",
+    "engine.io-client": "socketio/engine.io-client#da24c1f",
     "s": "0.1.1"
   },
   "scripts": {

test/engine.io.js

@@ -84,6 +84,7 @@ describe('engine', function () {
         client.setEncoding('ascii');
         client.write([
             'GET / HTTP/1.1'
+          , 'Connection: Upgrade'
           , 'Upgrade: IRC/6.9'
           , '', ''
         ].join('\r\n'));
@@ -109,6 +110,7 @@ describe('engine', function () {
           client.setEncoding('ascii');
           client.write([
               'GET / HTTP/1.1'
+            , 'Connection: Upgrade'
             , 'Upgrade: IRC/6.9'
             , '', ''
           ].join('\r\n'));
@@ -137,6 +139,7 @@ describe('engine', function () {
           client.setEncoding('ascii');
           client.write([
               'GET / HTTP/1.1'
+            , 'Connection: Upgrade'
             , 'Upgrade: IRC/6.9'
             , '', ''
           ].join('\r\n'));
@@ -177,6 +180,7 @@ describe('engine', function () {
           client.setEncoding('ascii');
           client.write([
               'GET / HTTP/1.1'
+            , 'Connection: Upgrade'
             , 'Upgrade: IRC/6.9'
             , '', ''
           ].join('\r\n'));