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

socketio · Sep 3, 2011 · 20ddd5f · 20ddd5f
2 parents e1891fd + 4d66f78
commit 20ddd5f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/manager.js b/lib/manager.js
@@ -71,7 +71,7 @@ function Manager (server, options) {
     , 'heartbeat interval': 20
     , 'polling duration': 20
     , 'flash policy server': true
-    , 'flash policy port': 843
+    , 'flash policy port': 10843
     , 'destroy upgrade': true
     , 'browser client': true
     , 'browser client minification': false
@@ -775,8 +775,7 @@ Manager.prototype.handleHandshake = function (data, req, res) {
       res.writeHead(200, { 'Content-Type': 'application/javascript' });
       res.end('io.j[' + data.query.jsonp + '](new Error("' + message + '"));');
     } else {
-      res.writeHead(200, { 'Content-Type': 'text/plain' });
-      res.writeHead(status);
+      res.writeHead(status, { 'Content-Type': 'text/plain' });
       res.end(message);
     }
   };