Merge branch 'master' of git://github.com/LearnBoost/Socket.IO-node

Author: 3rd-Eden

History.md

@@ -1,4 +1,9 @@
 
+0.6.16 / 2011-03-04
+===================
+
+  * Fixed cross domain xhr-polling in Safari [tifroz]
+
 0.6.15 / 2011-02-23
 ===================
 

lib/socket.io/index.js

@@ -23,4 +23,4 @@ exports.Listener = require('./listener');
  * Version
  */
 
-exports.version = '0.6.15';
+exports.version = '0.6.16';

lib/socket.io/transports/xhr-polling.js

@@ -69,7 +69,7 @@ Polling.prototype._write = function(message){
     var headers = {'Content-Type': 'text/plain; charset=UTF-8', 'Content-Length': Buffer.byteLength(message)};
     // https://developer.mozilla.org/En/HTTP_Access_Control
     if (this.request.headers.origin && this._verifyOrigin(this.request.headers.origin)){
-      headers['Access-Control-Allow-Origin'] = this.request.headers.origin;
+      headers['Access-Control-Allow-Origin'] = (this.request.headers.origin === 'null' ? '*' : this.request.headers.origin);
       if (this.request.headers.cookie) headers['Access-Control-Allow-Credentials'] = 'true';
     }
     this.response.writeHead(200, headers);

package.json

@@ -1,6 +1,6 @@
 { "name" : "socket.io"
 , "description" : "The cross-browser WebSocket"
-, "version" : "0.6.15"
+, "version" : "0.6.16"
 , "author" : "LearnBoost"
 , "licenses" :
   [ { "type" : "MIT"