Release 0.9.3

Merge pull request #806 from mixu/upstream/fix-ff-xhr-post-syntax
Fix "syntax error" message on FF, resulting from FF trying to parse the POST result as XML due to it not having a response content-type
2026-01-12 00:17:56 -05:00 · 2012-03-28 09:28:05 -03:00 · 2012-03-27 16:54:29 -07:00 · 2012-03-27 16:43:17 -07:00 · 2012-03-13 11:00:50 -03:00 · 2012-03-13 10:49:06 -03:00
7 changed files with 37 additions and 10 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 0.4
  - 0.6

 notifications:
--- a/History.md
+++ b/History.md
@@ -1,4 +1,26 @@

+0.9.3 / 2012-03-28
+==================
+
+  * Fix "Syntax error" on FF Web Console with XHR Polling [mikito]
+
+0.9.2 / 2012-03-13
+==================
+
+  * More sensible close `timeout default` (fixes disconnect issue)
+
+0.9.1-1 / 2012-03-02
+====================
+
+  * Bumped client with NPM dependency fix.
+
+0.9.1 / 2012-03-02
+==================
+
+  * Changed heartbeat timeout and interval defaults (60 and 25 seconds)
+  * Make tests work both on 0.4 and 0.6
+  * Updated client (improvements + bug fixes).
+
 0.9.0 / 2012-02-26
 ==================

--- a/lib/manager.js
+++ b/lib/manager.js
@@ -71,9 +71,9 @@ function Manager (server, options) {
    , blacklist: ['disconnect']
    , 'log level': 3
    , 'log colors': tty.isatty(process.stdout.fd)
-    , 'close timeout': 25
-    , 'heartbeat timeout': 15
-    , 'heartbeat interval': 20
+    , 'close timeout': 60
+    , 'heartbeat interval': 25
+    , 'heartbeat timeout': 60
    , 'polling duration': 20
    , 'flash policy server': true
    , 'flash policy port': 10843
@@ -133,6 +133,12 @@ function Manager (server, options) {
    }
  }

+  // forward-compatibility with 1.0
+  var self = this;
+  this.sockets.on('connection', function (conn) {
+    self.emit('connection', conn);
+  });
+
  this.log.info('socket.io started');
 };

@@ -252,7 +258,7 @@ Manager.prototype.disabled = function (key) {
 Manager.prototype.configure = function (env, fn) {
  if ('function' == typeof env) {
    env.call(this);
-  } else if (env == process.env.NODE_ENV) {
+  } else if (env == (process.env.NODE_ENV || 'development')) {
    fn.call(this);
  }

--- a/lib/socket.io.js
+++ b/lib/socket.io.js
@@ -15,7 +15,7 @@ var client = require('socket.io-client');
 * Version.
 */

-exports.version = '0.9.0';
+exports.version = '0.9.3';

 /**
 * Supported protocol version.
--- a/lib/transports/http.js
+++ b/lib/transports/http.js
@@ -46,7 +46,7 @@ HTTPTransport.prototype.handleRequest = function (req) {
    var buffer = ''
      , res = req.res
      , origin = req.headers.origin
-      , headers = { 'Content-Length': 1 }
+      , headers = { 'Content-Length': 1, 'Content-Type': 'text/plain; charset=UTF-8' }
      , self = this;

    req.on('data', function (data) {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "socket.io"
-  , "version": "0.9.0"
+  , "version": "0.9.3"
  , "description": "Real-time apps made cross-browser & easy with a WebSocket-like API"
  , "homepage": "http://socket.io"
  , "keywords": ["websocket", "socket", "realtime", "socket.io", "comet", "ajax"]
@@ -16,7 +16,7 @@
      , "url": "https://github.com/LearnBoost/socket.io.git"
    }
  , "dependencies": {
-        "socket.io-client": "0.9.0"
+        "socket.io-client": "0.9.3"
      , "policyfile": "0.0.4"
      , "redis": "0.6.7"
    }
--- a/test/transports.websocket.test.js
+++ b/test/transports.websocket.test.js
@@ -25,7 +25,7 @@ module.exports = {
      , ws;

    io.set('transports', ['websocket']);
-    io.sockets.on('connection', function (socket) {
+    io.on('connection', function (socket) {
      socket.manager.transports[socket.id].name.should.equal('websocket');
      ws.finishClose();
      cl.end();
Author	SHA1	Message	Date
Guillermo Rauch	a232159ce8	Release 0.9.3	2012-03-28 09:28:05 -03:00
Guillermo Rauch	b9c3255b7c	Merge pull request #806 from mixu/upstream/fix-ff-xhr-post-syntax Fix "syntax error" message on FF, resulting from FF trying to parse the POST result as XML due to it not having a response content-type	2012-03-27 16:54:29 -07:00
Mikito Takada	d80010dcf0	Firefox will try to parse the response from POST requests, causing a syntax error message in the Web Console. Basically an addition to https://github.com/LearnBoost/socket.io/pull/501	2012-03-27 16:43:17 -07:00
Guillermo Rauch	e7d7582f84	Release 0.9.2	2012-03-13 11:00:50 -03:00
Guillermo Rauch	df5f23d309	More sensible close `timeout default` (fixes disconnect issue)	2012-03-13 10:49:06 -03:00
Guillermo Rauch	e018ba91eb	Merge branch 'master' of github.com:LearnBoost/socket.io	2012-03-09 08:47:01 -03:00
Guillermo Rauch	c59aa6ff2c	Getting ready for 1.0	2012-03-09 08:42:24 -03:00
Guillermo Rauch	9431709298	Merge pull request #787 from MatthewMueller/master io.configure('development', function() {...}) will trigger if NODE_ENV is not defined.	2012-03-09 02:17:15 -08:00
Matt Mueller	a29525e043	NODE_ENV in configure now defaults to development, which is consistent with express	2012-03-09 02:10:58 -08:00
Guillermo Rauch	5312e154b3	Release 0.9.1-1	2012-03-02 08:41:17 -03:00
Guillermo Rauch	480b86f382	Bumped client with NPM dependency fix.	2012-03-02 08:40:41 -03:00
Guillermo Rauch	c0e2c3012f	Release 0.9.1	2012-03-02 08:20:38 -03:00
Guillermo Rauch	97b04c4152	Merge branch 'master' of github.com:LearnBoost/socket.io	2012-03-02 07:50:59 -03:00
Guillermo Rauch	c8306e207d	Temporarily removing node 0.4 from travis-ci	2012-02-29 11:01:11 -03:00
Guillermo Rauch	de5c0b3554	Merge pull request #771 from felixge/heartbeat Make heartbeat timeout > heartbeat interval	2012-02-29 05:43:24 -08:00
Felix Geisendörfer	57a0b24060	Make heartbeat timeout > heartbeat interval Otherwise clients would detect timeouts before a heartbeat has a chance of reaching them. The new values themselves were suggested by @rauchg. I myself think that the heartbeat timeout should probably only be ~10s larger than the interval.	2012-02-29 14:15:37 +01:00