Fix for cross-domain websocket (fixes #42)

Author: rauchg

lib/socket.io/transports/websocket.js

@@ -30,15 +30,16 @@ WebSocket.prototype._onConnect = function(req, socket){
 		this.draft = 76;
 	}
 
-	var origin = this.request.headers.origin;
+	var origin = this.request.headers.origin,
+	    location = (this.connection.secure ? 'wss' : 'ws') + '://' + this.request.headers.host + this.request.url;
 
 	if (this.draft == 76){
 		headers = [
 			'HTTP/1.1 101 WebSocket Protocol Handshake',
 			'Upgrade: WebSocket',
 			'Connection: Upgrade',
-			'Sec-WebSocket-Origin: ' + (origin || 'null'),
-			'Sec-WebSocket-Location: ' + origin.replace(/^http/, 'ws') + this.request.url
+			'Sec-WebSocket-Origin: ' + origin,
+			'Sec-WebSocket-Location: ' + location
 		];
 
 		if ('sec-websocket-protocol' in this.request.headers){
@@ -50,7 +51,7 @@ WebSocket.prototype._onConnect = function(req, socket){
 			'Upgrade: WebSocket',
 			'Connection: Upgrade',
 			'WebSocket-Origin: ' + origin,
-			'WebSocket-Location: ' + origin.replace(/^http/, 'ws') + this.request.url
+			'WebSocket-Location: ' + location
 		];
 
 		try {