From c06de0953bbfb635c76b95b5864f3fd2425715e3 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 23 Sep 2010 11:34:31 +0100 Subject: [PATCH 1/3] add package.json for npm --- package.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000000..9fbe3c6d80 --- /dev/null +++ b/package.json @@ -0,0 +1,17 @@ +{ "name" : "socket.io" +, "description" : "Sockets for the rest of us." +, "version" : "0.5.2" +, "author" : "LearnBoost" +, "licenses" : + [ { "type" : "MIT" + , "url" : "http://github.com/maccman/Socket.IO-node/raw/master/README.md" + } + ] +, "repository" : + { "type" : "git" + , "url" : "http://github.com/maccman/Socket.IO-node.git" + } +, "engine" : [ "node >=0.1.102" ] +, "main" : "./index" +, "scripts" : { "test" : "make test" } +} From fcba035330023802cbb391fc013c16338b0d3d16 Mon Sep 17 00:00:00 2001 From: Alex MacCaw Date: Mon, 27 Sep 2010 06:45:53 -0700 Subject: [PATCH 2/3] Fix COR headers/requests for different ports on Safari. --- lib/socket.io/transports/xhr-multipart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/socket.io/transports/xhr-multipart.js b/lib/socket.io/transports/xhr-multipart.js index df51cc034f..bf205ea6f2 100644 --- a/lib/socket.io/transports/xhr-multipart.js +++ b/lib/socket.io/transports/xhr-multipart.js @@ -11,7 +11,7 @@ Multipart.prototype._onConnect = function(req, res){ var self = this, body = '', headers = {}; // https://developer.mozilla.org/En/HTTP_Access_Control if (req.headers.origin && this._verifyOrigin(req.headers.origin)){ - headers['Access-Control-Allow-Origin'] = req.headers.origin; + headers['Access-Control-Allow-Origin'] = '*'; headers['Access-Control-Allow-Credentials'] = 'true'; } if (typeof req.headers['access-control-request-method'] !== 'undefined'){ From 607fe38952d23c24b4dff1d9b5ba338b80e53b03 Mon Sep 17 00:00:00 2001 From: Alex MacCaw Date: Mon, 27 Sep 2010 06:46:19 -0700 Subject: [PATCH 3/3] Fix COR headers/requests for different ports on Safari. --- lib/socket.io/transports/xhr-polling.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/socket.io/transports/xhr-polling.js b/lib/socket.io/transports/xhr-polling.js index 732e6a331c..a02b513263 100644 --- a/lib/socket.io/transports/xhr-polling.js +++ b/lib/socket.io/transports/xhr-polling.js @@ -26,7 +26,7 @@ Polling.prototype._onConnect = function(req, res){ var headers = {'Content-Type': 'text/plain'}; if (req.headers.origin){ if (self._verifyOrigin(req.headers.origin)){ - headers['Access-Control-Allow-Origin'] = req.headers.origin; + headers['Access-Control-Allow-Origin'] = '*'; if (req.headers.cookie) headers['Access-Control-Allow-Credentials'] = 'true'; } else { res.writeHead(401);