Also check for connection header; added test for this

Author: Guilherme Souza

Connection.js

@@ -360,11 +360,13 @@ Connection.prototype.answerHandshake = function (lines) {
 	this.readHeaders(lines)
 
 	// Validate necessary headers
-	if (!('host' in this.headers) || !('sec-websocket-key' in this.headers)) {
+	if (!('host' in this.headers) ||
+		!('sec-websocket-key' in this.headers) ||
+		!('upgrade' in this.headers) ||
+		!('connection' in this.headers)) {
 		return false
 	}
-	if (!this.headers.upgrade 
-		this.headers.upgrade.toLowerCase() !== 'websocket' ||
+	if (this.headers.upgrade.toLowerCase() !== 'websocket' ||
 		this.headers.connection.toLowerCase().split(', ').indexOf('upgrade') === -1) {
 		return false
 	}
@@ -554,4 +556,4 @@ Connection.prototype.processCloseFrame = function (payload) {
 	this.socket.write(frame.createCloseFrame(code, reason, !this.server))
 	this.readyState = this.CLOSED
 	this.emit('close', code, reason)
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nodejs-websocket",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"author": "Sitegui <[email protected]>",
 	"description": "Basic server&client approach to websocket (text and binary frames)",
 	"main": "./index.js",

test/test.js

@@ -3,6 +3,7 @@
 
 require('should')
 var ws = require('../index')
+var net = require('net')
 
 var TEST_PORT = 8017
 var testServer, testClient, testConn
@@ -149,6 +150,19 @@ describe('handshake', function () {
 			})
 		})
 	})
+
+	it('should work when there is some missing headers', function (done) {
+		var conn = net.connect(TEST_PORT)
+		conn.write('GET / HTTP/1.1\r\n' +
+			'Host: localhost\r\n' +
+			'Sec-websocket-key: key\r\n' +
+			'C: 3\r\n' +
+			'D: 4\r\n' +
+			'E: 5\r\n\r\n')
+		conn.once('close', function () {
+			done()
+		})
+	})
 })
 
 function getClient() {