Merge branch 'master' of github.com:LearnBoost/socket.io into travis

sikancil · Nov 22, 2011 · 8fc3e37 · 8fc3e37
2 parents 0f29d78 + 17d0f4d
commit 8fc3e37
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/lib/manager.js b/lib/manager.js
@@ -727,11 +727,8 @@ Manager.prototype.handleHandshake = function (data, req, res) {
 
   if (origin) {
     // https://developer.mozilla.org/En/HTTP_Access_Control
-    headers['Access-Control-Allow-Origin'] = '*';
-
-    if (req.headers.cookie) {
-      headers['Access-Control-Allow-Credentials'] = 'true';
-    }
+    headers['Access-Control-Allow-Origin'] = origin;
+    headers['Access-Control-Allow-Credentials'] = 'true';
   }
 
   this.authorize(handshakeData, function (err, authorized, newData) {