Release 0.9.2

More sensible close timeout default (fixes disconnect issue)
Merge branch 'master' of github.com:LearnBoost/socket.io
2026-01-12 00:17:56 -05:00 · 2012-03-13 11:00:50 -03:00 · 2012-03-13 10:49:06 -03:00 · 2012-03-09 08:47:01 -03:00 · 2012-03-09 08:42:24 -03:00 · 2012-03-09 02:17:15 -08:00
47 changed files with 1357 additions and 755 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ lib-cov
 *.dat
 *.out
 *.pid
+benchmarks/*.png
 node_modules
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - 0.6
+
+notifications:
+  irc: "irc.freenode.org#socket.io"
--- a/History.md
+++ b/History.md
@@ -1,4 +1,78 @@

+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
+==================
+
+  * Make it possible to use a regexp to match the socket.io resource URL.
+    We need this because we have to prefix the socket.io URL with a variable ID.
+  * Supplemental fix to gavinuhma/authfix, it looks like the same Access-Control-Origin logic is needed in the http and xhr-polling transports
+  * Updated express dep for windows compatibility.
+  * Combine two substr calls into one in decodePayload to improve performance
+  * Minor documentation fix
+  * Minor. Conform to style of other files.
+  * Switching setting to 'match origin protocol'
+  * Revert "Fixes leaking Redis subscriptions for #663. The local flag was not getting passed through onClientDisconnect()."
+  * Revert "Handle leaked dispatch:[id] subscription."
+  * Merge pull request #667 from dshaw/patch/redis-disconnect
+  * Handle leaked dispatch:[id] subscription.
+  * Fixes leaking Redis subscriptions for #663. The local flag was not getting passed through onClientDisconnect().
+  * Prevent memory leaking on uncompleted requests & add max post size limitation
+  * Fix for testcase
+  * Set Access-Control-Allow-Credentials true, regardless of cookie
+  * Remove assertvarnish from package as it breaks on 0.6
+  * Correct irc channel
+  * Added proper return after reserved field error
+  * Fixes manager.js failure to close connection after transport error has happened
+  * Added implicit port 80 for origin checks. fixes #638
+  * Fixed bug #432 in 0.8.7
+  * Set Access-Control-Allow-Origin header to origin to enable withCredentials
+  * Adding configuration variable matchOriginProtocol
+  * Fixes location mismatch error in Safari.
+  * Use tty to detect if we should add colors or not by default.
+  * Updated the package location.
+
+0.8.7 / 2011-11-05
+==================
+
+  * Fixed memory leaks in closed clients.
+  * Fixed memory leaks in namespaces.
+  * Fixed websocket handling for malformed requests from proxies. [einaros]
+  * Node 0.6 compatibility. [einaros] [3rd-Eden]
+  * Adapted tests and examples.
+
+0.8.6 / 2011-10-27 
+==================
+
+  * Added JSON decoding on jsonp-polling transport.
+  * Fixed README example.
+  * Major speed optimizations [3rd-Eden] [einaros] [visionmedia]
+  * Added decode/encode benchmarks [visionmedia]
+  * Added support for black-listing client sent events.
+  * Fixed logging options, closes #540 [3rd-Eden]
+  * Added vary header for gzip [3rd-Eden]
+  * Properly cleaned up async websocket / flashsocket tests, after patching node-websocket-client
+  * Patched to properly shut down when a finishClose call is made during connection establishment
+  * Added support for socket.io version on url and far-future Expires [3rd-Eden] [getify]
+  * Began IE10 compatibility [einaros] [tbranyen]
+  * Misc WebSocket fixes [einaros]
+  * Added UTF8 to respone headers for htmlfile [3rd-Eden]
+
 0.8.5 / 2011-10-07
 ==================

--- a/15
+++ b/15
@@ -1,17 +1,17 @@

 ALL_TESTS = $(shell find test/ -name '*.test.js')
+ALL_BENCH = $(shell find benchmarks -name '*.bench.js')

 run-tests:
 	@./node_modules/.bin/expresso \
 		-t 3000 \
 		-I support \
-		-I lib \
 		--serial \
 		$(TESTFLAGS) \
 		$(TESTS)

 test:
-	@$(MAKE) TESTS="$(ALL_TESTS)" run-tests
+	@$(MAKE) NODE_PATH=lib TESTS="$(ALL_TESTS)" run-tests

 test-cov:
 	@TESTFLAGS=--cov $(MAKE) test
@@ -19,4 +19,13 @@ test-cov:
 test-leaks:
 	@ls test/leaks/* | xargs node --expose_debug_as=debug --expose_gc

-.PHONY: test
+run-bench:
+	@node $(PROFILEFLAGS) benchmarks/runner.js
+
+bench:
+	@$(MAKE) BENCHMARKS="$(ALL_BENCH)" run-bench
+
+profile:
+	@PROFILEFLAGS='--prof --trace-opt --trace-bailout --trace-deopt' $(MAKE) bench
+
+.PHONY: test bench profile
--- a/Readme.md
+++ b/Readme.md
@@ -67,7 +67,7 @@ io.sockets.on('connection', function (socket) {
  });

  socket.on('disconnect', function () {
-    sockets.emit('user disconnected');
+    io.sockets.emit('user disconnected');
  });
 });
 ```
@@ -131,7 +131,7 @@ The following example defines a socket that listens on '/chat' and one for
 var io = require('socket.io').listen(80);

 var chat = io
-  .of('/chat');
+  .of('/chat')
  .on('connection', function (socket) {
    socket.emit('a message', { that: 'only', '/chat': 'will get' });
    chat.emit('a message', { everyone: 'in', '/chat': 'will get' });
--- a/benchmarks/decode.bench.js
+++ b/benchmarks/decode.bench.js
@@ -0,0 +1,64 @@
+
+/**
+ * Module dependencies.
+ */
+
+var benchmark = require('benchmark')
+  , colors = require('colors')
+  , io = require('../')
+  , parser = io.parser
+  , suite = new benchmark.Suite('Decode packet');
+
+suite.add('string', function () {
+  parser.decodePacket('4:::"2"');
+});
+
+suite.add('event', function () {
+  parser.decodePacket('5:::{"name":"woot"}');
+});
+
+suite.add('event+ack', function () {
+  parser.decodePacket('5:1+::{"name":"tobi"}');
+});
+
+suite.add('event+data', function () {
+  parser.decodePacket('5:::{"name":"edwald","args":[{"a": "b"},2,"3"]}');
+});
+
+suite.add('heartbeat', function () {
+  parser.decodePacket('2:::');
+});
+
+suite.add('error', function () {
+  parser.decodePacket('7:::2+0');
+});
+
+var payload = parser.encodePayload([
+    parser.encodePacket({ type: 'message', data: '5', endpoint: '' })
+  , parser.encodePacket({ type: 'message', data: '53d', endpoint: '' })
+  , parser.encodePacket({ type: 'message', data: 'foobar', endpoint: '' })
+  , parser.encodePacket({ type: 'message', data: 'foobarbaz', endpoint: '' })
+  , parser.encodePacket({ type: 'message', data: 'foobarbazfoobarbaz', endpoint: '' })
+  , parser.encodePacket({ type: 'message', data: 'foobarbaz', endpoint: '' })
+  , parser.encodePacket({ type: 'message', data: 'foobar', endpoint: '' })
+]);
+
+suite.add('payload', function () {
+  parser.decodePayload(payload);
+});
+
+suite.on('cycle', function (bench, details) {
+  console.log('\n' + suite.name.grey, details.name.white.bold);
+  console.log([
+      details.hz.toFixed(2).cyan + ' ops/sec'.grey
+    , details.count.toString().white + ' times executed'.grey
+    , 'benchmark took '.grey + details.times.elapsed.toString().white + ' sec.'.grey
+    , 
+  ].join(', '.grey));
+});
+
+if (!module.parent) {
+  suite.run();
+} else {
+  module.exports = suite;
+}
--- a/benchmarks/encode.bench.js
+++ b/benchmarks/encode.bench.js
@@ -0,0 +1,90 @@
+
+/**
+ * Module dependencies.
+ */
+
+var benchmark = require('benchmark')
+  , colors = require('colors')
+  , io = require('../')
+  , parser = io.parser
+  , suite = new benchmark.Suite('Encode packet');
+
+suite.add('string', function () {
+  parser.encodePacket({
+      type: 'json'
+    , endpoint: ''
+    , data: '2'
+  });
+});
+
+suite.add('event', function () {
+  parser.encodePacket({
+      type: 'event'
+    , name: 'woot'
+    , endpoint: ''
+    , args: []
+  });
+});
+
+suite.add('event+ack', function () {
+  parser.encodePacket({
+      type: 'json'
+    , id: 1
+    , ack: 'data'
+    , endpoint: ''
+    , data: { a: 'b' }
+  });
+});
+
+suite.add('event+data', function () {
+  parser.encodePacket({
+      type: 'event'
+    , name: 'edwald'
+    , endpoint: ''
+    , args: [{a: 'b'}, 2, '3']
+  });
+});
+
+suite.add('heartbeat', function () {
+  parser.encodePacket({
+      type: 'heartbeat'
+    , endpoint: ''
+  })
+});
+
+suite.add('error', function () {
+  parser.encodePacket({
+      type: 'error'
+    , reason: 'unauthorized'
+    , advice: 'reconnect'
+    , endpoint: ''
+  })
+})
+
+suite.add('payload', function () {
+  parser.encodePayload([
+      parser.encodePacket({ type: 'message', data: '5', endpoint: '' })
+    , parser.encodePacket({ type: 'message', data: '53d', endpoint: '' })
+    , parser.encodePacket({ type: 'message', data: 'foobar', endpoint: '' })
+    , parser.encodePacket({ type: 'message', data: 'foobarbaz', endpoint: '' })
+    , parser.encodePacket({ type: 'message', data: 'foobarbazfoobarbaz', endpoint: '' })
+    , parser.encodePacket({ type: 'message', data: 'foobarbaz', endpoint: '' })
+    , parser.encodePacket({ type: 'message', data: 'foobar', endpoint: '' })
+  ]);
+});
+
+suite.on('cycle', function (bench, details) {
+  console.log('\n' + suite.name.grey, details.name.white.bold);
+  console.log([
+      details.hz.toFixed(2).cyan + ' ops/sec'.grey
+    , details.count.toString().white + ' times executed'.grey
+    , 'benchmark took '.grey + details.times.elapsed.toString().white + ' sec.'.grey
+    , 
+  ].join(', '.grey));
+});
+
+if (!module.parent) {
+  suite.run();
+} else {
+  module.exports = suite;
+}
--- a/benchmarks/runner.js
+++ b/benchmarks/runner.js
@@ -0,0 +1,55 @@
+/**
+ * Benchmark runner dependencies
+ */
+
+var colors = require('colors')
+  , path = require('path');
+
+/**
+ * Find all the benchmarks
+ */
+
+var benchmarks_files = process.env.BENCHMARKS.split(' ')
+  , all = [].concat(benchmarks_files)
+  , first = all.shift()
+  , benchmarks = {};
+
+// find the benchmarks and load them all in our obj
+benchmarks_files.forEach(function (file) {
+  benchmarks[file] = require(path.join(__dirname, '..', file));
+});
+
+// setup the complete listeners
+benchmarks_files.forEach(function (file) {
+  var benchmark = benchmarks[file]
+    , next_file = all.shift()
+    , next = benchmarks[next_file];
+
+  /**
+   * Generate a oncomplete function for the tests, either we are done or we
+   * have more benchmarks to process.
+   */
+
+   function complete () {
+      if (!next) {
+        console.log(
+          '\n\nBenchmark completed in'.grey
+        , (Date.now() - start).toString().green + ' ms'.grey
+        );
+      } else {
+        console.log('\nStarting benchmark '.grey + next_file.yellow);
+        next.run();
+      }
+   }
+
+   // attach the listener
+   benchmark.on('complete', complete);
+});
+
+/**
+ * Start the benchmark
+ */
+
+var start = Date.now();
+console.log('Starting benchmark '.grey + first.yellow);
+benchmarks[first].run();
--- a/examples/chat/app.js
+++ b/examples/chat/app.js
@@ -1,10 +1,3 @@
-
-/**
- * Bootstrap app.
- */
-
-require.paths.unshift(__dirname + '/../../lib/');
-
 /**
 * Module dependencies.
 */
@@ -12,7 +5,7 @@ require.paths.unshift(__dirname + '/../../lib/');
 var express = require('express')
  , stylus = require('stylus')
  , nib = require('nib')
-  , sio = require('socket.io');
+  , sio = require('../../lib/socket.io');

 /**
 * App.
@@ -25,7 +18,7 @@ var app = express.createServer();
 */

 app.configure(function () {
-  app.use(stylus.middleware({ src: __dirname + '/public', compile: compile }))
+  app.use(stylus.middleware({ src: __dirname + '/public', compile: compile }));
  app.use(express.static(__dirname + '/public'));
  app.set('views', __dirname);
  app.set('view engine', 'jade');
--- a/examples/chat/package.json
+++ b/examples/chat/package.json
@@ -3,9 +3,9 @@
  , "description": "example chat application with socket.io"
  , "version": "0.0.1"
  , "dependencies": {
-        "express": "2.3.11"
-      , "jade": "0.12.1"
-      , "stylus": "0.13.3"
-      , "nib": "0.0.8"
+        "express": "2.5.5"
+      , "jade": "0.16.4"
+      , "stylus": "0.19.0"
+      , "nib": "0.2.0"
    }
 }
--- a/examples/irc-output/app.js
+++ b/examples/irc-output/app.js
@@ -1,10 +1,3 @@
-
-/**
- * Bootstrap app.
- */
-
-require.paths.unshift(__dirname + '/../../lib/');
-
 /**
 * Module dependencies.
 */
@@ -12,7 +5,7 @@ require.paths.unshift(__dirname + '/../../lib/');
 var express = require('express')
  , stylus = require('stylus')
  , nib = require('nib')
-  , sio = require('socket.io')
+  , sio = require('../../lib/socket.io')
  , irc = require('./irc');

 /**
--- a/examples/irc-output/irc.js
+++ b/examples/irc-output/irc.js
@@ -2,7 +2,7 @@
 * From https://github.com/felixge/nodelog/
 */

-var sys = require('sys');
+var sys = require('util');
 var tcp = require('net');
 var irc = exports;

--- a/examples/irc-output/package.json
+++ b/examples/irc-output/package.json
@@ -2,9 +2,9 @@
    "name": "socket.io-irc"
  , "version": "0.0.1"
  , "dependencies": {
-        "express": "2.3.11"
-      , "jade": "0.12.1"
-      , "stylus": "0.13.3"
-      , "nib": "0.0.8"
+        "express": "2.5.5"
+      , "jade": "0.16.4"
+      , "stylus": "0.19.0"
+      , "nib": "0.2.0"
    }
 }
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -60,6 +60,7 @@ var Logger = module.exports = function (opts) {
  opts = opts || {}
  this.colors = false !== opts.colors;
  this.level = 3;
+  this.enabled = true;
 };

 /**
@@ -71,7 +72,7 @@ var Logger = module.exports = function (opts) {
 Logger.prototype.log = function (type) {
  var index = levels.indexOf(type);

-  if (index > this.level)
+  if (index > this.level || !this.enabled)
    return this;

  console.log.apply(
--- a/lib/manager.js
+++ b/lib/manager.js
@@ -10,6 +10,7 @@

 var fs = require('fs')
  , url = require('url')
+  , tty = require('tty')
  , util = require('./util')
  , store = require('./store')
  , client = require('socket.io-client')
@@ -67,21 +68,26 @@ function Manager (server, options) {
    , resource: '/socket.io'
    , transports: defaultTransports
    , authorization: false
+    , blacklist: ['disconnect']
    , 'log level': 3
-    , 'close timeout': 25
-    , 'heartbeat timeout': 15
-    , 'heartbeat interval': 20
+    , 'log colors': tty.isatty(process.stdout.fd)
+    , 'close timeout': 60
+    , 'heartbeat interval': 25
+    , 'heartbeat timeout': 60
    , 'polling duration': 20
    , 'flash policy server': true
    , 'flash policy port': 10843
    , 'destroy upgrade': true
+    , 'destroy buffer size': 10E7
    , 'browser client': true
    , 'browser client cache': true
    , 'browser client minification': false
    , 'browser client etag': false
+    , 'browser client expires': 315360000
    , 'browser client gzip': false
    , 'browser client handler': false
    , 'client store expiration': 15
+    , 'match origin protocol': false
  };

  for (var i in options) {
@@ -90,6 +96,11 @@ function Manager (server, options) {

  var self = this;

+  // default error handler
+  server.on('error', function(err) {
+    self.log.warn('error raised: ' + err);
+  });
+
  this.initStore();

  this.on('set:store', function() {
@@ -122,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');
 };

@@ -146,10 +163,11 @@ Manager.prototype.__defineGetter__('store', function () {
 */

 Manager.prototype.__defineGetter__('log', function () {
-  if (this.disabled('log')) return;
-
  var logger = this.get('logger');
+
  logger.level = this.get('log level') || -1;
+  logger.colors = this.get('log colors');
+  logger.enabled = this.enabled('log');

  return logger;
 });
@@ -240,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);
  }

@@ -258,7 +276,6 @@ Manager.prototype.initStore = function () {
  this.connected = {};
  this.open = {};
  this.closed = {};
-  this.closedA = [];
  this.rooms = {};
  this.roomClients = {};

@@ -330,8 +347,6 @@ Manager.prototype.onOpen = function (id) {
  if (this.closed[id]) {
    var self = this;

-    this.closedA.splice(this.closedA.indexOf(id), 1);
-
    this.store.unsubscribe('dispatch:' + id, function () {
      delete self.closed[id];
    });
@@ -420,7 +435,6 @@ Manager.prototype.onClose = function (id) {
  }

  this.closed[id] = [];
-  this.closedA.push(id);

  var self = this;

@@ -463,9 +477,8 @@ Manager.prototype.onClientMessage = function (id, packet) {

 Manager.prototype.onClientDisconnect = function (id, reason) {
  for (var name in this.namespaces) {
-    if (this.roomClients[id][name]) {
-      this.namespaces[name].handleDisconnect(id, reason);
-    }
+    this.namespaces[name].handleDisconnect(id, reason, typeof this.roomClients[id] !== 'undefined' &&
+      typeof this.roomClients[id][name] !== 'undefined');
  }

  this.onDisconnect(id);
@@ -495,7 +508,6 @@ Manager.prototype.onDisconnect = function (id, local) {

  if (this.closed[id]) {
    delete this.closed[id];
-    this.closedA.splice(this.closedA.indexOf(id), 1);
  }

  if (this.roomClients[id]) {
@@ -622,6 +634,11 @@ Manager.prototype.handleClient = function (data, req) {
  var transport = new transports[data.transport](this, data, req)
    , handshaken = this.handshaken[data.id];

+  if (transport.disconnected) {
+    // failed during transport setup
+    req.connection.end();
+    return;
+  }
  if (handshaken) {
    if (transport.open) {
      if (this.closed[data.id] && this.closed[data.id].length) {
@@ -718,11 +735,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) {
@@ -772,12 +786,12 @@ Manager.prototype.handshakeData = function (data) {
    connectionAddress = {
        address: connection.remoteAddress
      , port: connection.remotePort
-    }; 
+    };
  } else if (connection.socket && connection.socket.remoteAddress) {
    connectionAddress = {
        address: connection.socket.remoteAddress
      , port: connection.socket.remotePort
-    }; 
+    };
  }

  return {
@@ -811,6 +825,7 @@ Manager.prototype.verifyOrigin = function (request) {
  if (origin) {
    try {
      var parts = url.parse(origin);
+      parts.port = parts.port || 80;
      var ok =
        ~origins.indexOf(parts.hostname + ':' + parts.port) ||
        ~origins.indexOf(parts.hostname + ':*') ||
@@ -822,7 +837,7 @@ Manager.prototype.verifyOrigin = function (request) {
    }
  }
  else {
-    this.log.warn('origin missing from handshake, yet required by config');        
+    this.log.warn('origin missing from handshake, yet required by config');
  }
  return false;
 };
@@ -895,8 +910,17 @@ var regexp = /^\/([^\/]+)\/?([^\/]+)?\/?([^\/]+)?\/?$/
 Manager.prototype.checkRequest = function (req) {
  var resource = this.get('resource');

-  if (req.url.substr(0, resource.length) == resource) {
-    var uri = url.parse(req.url.substr(resource.length), true)
+  var match;
+  if (typeof resource === 'string') {
+    match = req.url.substr(0, resource.length);
+    if (match !== resource) match = null;
+  } else {
+    match = resource.exec(req.url);
+    if (match) match = match[0];
+  }
+
+  if (match) {
+    var uri = url.parse(req.url.substr(match.length), true)
      , path = uri.pathname || ''
      , pieces = path.match(regexp);

--- a/lib/namespace.js
+++ b/lib/namespace.js
@@ -34,7 +34,7 @@ function SocketNamespace (mgr, name) {
 SocketNamespace.prototype.__proto__ = EventEmitter.prototype;

 /**
- * Copies emit since we override it
+ * Copies emit since we override it.
 *
 * @api private
 */
@@ -103,7 +103,7 @@ SocketNamespace.prototype.__defineGetter__('volatile', function () {
 });

 /**
- * Overrides the room to relay messages to (flag)
+ * Overrides the room to relay messages to (flag).
 *
 * @api public
 */
@@ -114,7 +114,7 @@ SocketNamespace.prototype.in = SocketNamespace.prototype.to = function (room) {
 };

 /**
- * Adds a session id we should prevent relaying messages to (flag)
+ * Adds a session id we should prevent relaying messages to (flag).
 *
 * @api public
 */
@@ -139,7 +139,7 @@ SocketNamespace.prototype.setFlags = function () {
 };

 /**
- * Sends out a packet
+ * Sends out a packet.
 *
 * @api private
 */
@@ -175,9 +175,9 @@ SocketNamespace.prototype.send = function (data) {
 };

 /**
- * Emits to everyone (override)
+ * Emits to everyone (override).
 *
- * @api private
+ * @api public
 */

 SocketNamespace.prototype.emit = function (name) {
@@ -196,7 +196,7 @@ SocketNamespace.prototype.emit = function (name) {
 * Retrieves or creates a write-only socket for a client, unless specified.
 *
 * @param {Boolean} whether the socket will be readable when initialized
- * @api private
+ * @api public
 */

 SocketNamespace.prototype.socket = function (sid, readable) {
@@ -208,7 +208,7 @@ SocketNamespace.prototype.socket = function (sid, readable) {
 };

 /**
- * Sets authorization for this namespace
+ * Sets authorization for this namespace.
 *
 * @api public
 */
@@ -224,9 +224,9 @@ SocketNamespace.prototype.authorization = function (fn) {
 * @api private
 */

-SocketNamespace.prototype.handleDisconnect = function (sid, reason) {
+SocketNamespace.prototype.handleDisconnect = function (sid, reason, raiseOnDisconnect) {
  if (this.sockets[sid] && this.sockets[sid].readable) {
-    this.sockets[sid].onDisconnect(reason);
+    if (raiseOnDisconnect) this.sockets[sid].onDisconnect(reason);
    delete this.sockets[sid];
  }
 };
@@ -264,6 +264,7 @@ SocketNamespace.prototype.authorize = function (data, fn) {
 SocketNamespace.prototype.handlePacket = function (sessid, packet) {
  var socket = this.socket(sessid)
    , dataAck = packet.ack == 'data'
+    , manager = this.manager
    , self = this;

  function ack () {
@@ -296,8 +297,7 @@ SocketNamespace.prototype.handlePacket = function (sessid, packet) {
      if (packet.endpoint == '') {
        connect();
      } else {
-        var manager = this.manager
-          , handshakeData = manager.handshaken[sessid];
+        var handshakeData = manager.handshaken[sessid];

        this.authorize(handshakeData, function (err, authorized, newData) {
          if (err) return error(err);
@@ -322,13 +322,18 @@ SocketNamespace.prototype.handlePacket = function (sessid, packet) {
      break;

    case 'event':
-      var params = [packet.name].concat(packet.args);
+      // check if the emitted event is not blacklisted
+      if (-~manager.get('blacklist').indexOf(packet.name)) {
+        this.log.debug('ignoring blacklisted event `' + packet.name + '`');
+      } else {
+        var params = [packet.name].concat(packet.args);

-      if (dataAck) {
-        params.push(ack);
+        if (dataAck) {
+          params.push(ack);
+        }
+
+        socket.$emit.apply(socket, params);
      }
-
-      socket.$emit.apply(socket, params);
      break;

    case 'disconnect':
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -13,35 +13,38 @@
 * Packet types.
 */

-var packets = exports.packets = [
-    'disconnect'
-  , 'connect'
-  , 'heartbeat'
-  , 'message'
-  , 'json'
-  , 'event'
-  , 'ack'
-  , 'error'
-  , 'noop'
-];
+var packets = exports.packets = {
+      'disconnect': 0
+    , 'connect': 1
+    , 'heartbeat': 2
+    , 'message': 3
+    , 'json': 4
+    , 'event': 5
+    , 'ack': 6
+    , 'error': 7
+    , 'noop': 8
+  }
+  , packetslist = Object.keys(packets);

 /**
 * Errors reasons.
 */

-var reasons = exports.reasons = [
-    'transport not supported'
-  , 'client not handshaken'
-  , 'unauthorized'
-];
+var reasons = exports.reasons = {
+      'transport not supported': 0
+    , 'client not handshaken': 1
+    , 'unauthorized': 2
+  }
+  , reasonslist = Object.keys(reasons);

 /**
 * Errors advice.
 */

-var advice = exports.advice = [
-    'reconnect'
-];
+var advice = exports.advice = {
+      'reconnect': 0
+  }
+  , advicelist = Object.keys(advice);

 /**
 * Encodes a packet.
@@ -50,22 +53,13 @@ var advice = exports.advice = [
 */

 exports.encodePacket = function (packet) {
-  var type = packets.indexOf(packet.type)
+  var type = packets[packet.type]
    , id = packet.id || ''
    , endpoint = packet.endpoint || ''
    , ack = packet.ack
    , data = null;

  switch (packet.type) {
-    case 'error':
-      var reason = packet.reason ? reasons.indexOf(packet.reason) : ''
-        , adv = packet.advice ? advice.indexOf(packet.advice) : ''
-
-      if (reason !== '' || adv !== '')
-        data = reason + (adv !== '' ? ('+' + adv) : '')
-
-      break;
-
    case 'message':
      if (packet.data !== '')
        data = packet.data;
@@ -85,30 +79,35 @@ exports.encodePacket = function (packet) {
      data = JSON.stringify(packet.data);
      break;

-    case 'connect':
-      if (packet.qs)
-        data = packet.qs;
-      break;
-
    case 'ack':
      data = packet.ackId
        + (packet.args && packet.args.length
            ? '+' + JSON.stringify(packet.args) : '');
      break;
+
+    case 'connect':
+      if (packet.qs)
+        data = packet.qs;
+      break;
+
+     case 'error':
+      var reason = packet.reason ? reasons[packet.reason] : ''
+        , adv = packet.advice ? advice[packet.advice] : ''
+
+      if (reason !== '' || adv !== '')
+        data = reason + (adv !== '' ? ('+' + adv) : '')
+
+      break;
  }

  // construct packet with required fragments
-  var encoded = [
-      type
-    , id + (ack == 'data' ? '+' : '')
-    , endpoint
-  ];
+  var encoded = type + ':' + id + (ack == 'data' ? '+' : '') + ':' + endpoint;

  // data fragment is optional
  if (data !== null && data !== undefined)
-    encoded.push(data);
+    encoded += ':' + data;

-  return encoded.join(':');
+  return encoded;
 };

 /**
@@ -140,6 +139,18 @@ exports.encodePayload = function (packets) {

 var regexp = /([^:]+):([0-9]+)?(\+)?:([^:]+)?:?([\s\S]*)?/;

+/**
+ * Wrap the JSON.parse in a seperate function the crankshaft optimizer will
+ * only punish this function for the usage for try catch
+ *
+ * @api private
+ */
+
+function parse (data) {
+  try { return JSON.parse(data) }
+  catch (e) { return false }
+}
+
 exports.decodePacket = function (data) {
  var pieces = data.match(regexp);

@@ -148,7 +159,7 @@ exports.decodePacket = function (data) {
  var id = pieces[2] || ''
    , data = pieces[5] || ''
    , packet = {
-          type: packets[pieces[1]]
+          type: packetslist[pieces[1]]
        , endpoint: pieces[4] || ''
      };

@@ -163,30 +174,22 @@ exports.decodePacket = function (data) {

  // handle different packet types
  switch (packet.type) {
-    case 'error':
-      var pieces = data.split('+');
-      packet.reason = reasons[pieces[0]] || '';
-      packet.advice = advice[pieces[1]] || '';
-      break;
-
    case 'message':
      packet.data = data || '';
      break;

    case 'event':
-      try {
-        var opts = JSON.parse(data);
-        packet.name = opts.name;
-        packet.args = opts.args;
-      } catch (e) { }
+      pieces = parse(data);
+      if (pieces) {
+        packet.name = pieces.name;
+        packet.args = pieces.args;
+      }

      packet.args = packet.args || [];
      break;

    case 'json':
-      try {
-        packet.data = JSON.parse(data);
-      } catch (e) { }
+      packet.data = parse(data);
      break;

    case 'connect':
@@ -194,23 +197,22 @@ exports.decodePacket = function (data) {
      break;

    case 'ack':
-      var pieces = data.match(/^([0-9]+)(\+)?(.*)/);
+      pieces = data.match(/^([0-9]+)(\+)?(.*)/);
      if (pieces) {
        packet.ackId = pieces[1];
        packet.args = [];

        if (pieces[3]) {
-          try {
-            packet.args = pieces[3] ? JSON.parse(pieces[3]) : [];
-          } catch (e) { }
+          packet.args = parse(pieces[3]) || [];
        }
      }
      break;

-    case 'disconnect':
-    case 'heartbeat':
-      break;
-  };
+    case 'error':
+      pieces = data.split('+');
+      packet.reason = reasonslist[pieces[0]] || '';
+      packet.advice = advicelist[pieces[1]] || '';
+  }

  return packet;
 };
@@ -232,7 +234,7 @@ exports.decodePayload = function (data) {

    for (var i = 1, length = ''; i < data.length; i++) {
      if (data[i] == '\ufffd') {
-        ret.push(exports.decodePacket(data.substr(i + 1).substr(0, length)));
+        ret.push(exports.decodePacket(data.substr(i + 1, length)));
        i += Number(length) + 1;
        length = '';
      } else {
--- a/lib/socket.io.js
+++ b/lib/socket.io.js
@@ -15,7 +15,7 @@ var client = require('socket.io-client');
 * Version.
 */

-exports.version = '0.8.5';
+exports.version = '0.9.2';

 /**
 * Supported protocol version.
--- a/lib/static.js
+++ b/lib/static.js
@@ -42,7 +42,8 @@ var mime = {
 * @api private
 */

-var bundle = /\+((?:\+)?[\w\-]+)*(?:\.js)$/g;
+var bundle = /\+((?:\+)?[\w\-]+)*(?:\.v\d+\.\d+\.\d+)?(?:\.js)$/
+  , versioning = /\.v\d+\.\d+\.\d+(?:\.js)$/;

 /**
 * Export the constructor
@@ -120,10 +121,14 @@ Static.prototype.init = function () {
    build(self.manager.get('transports'), callback);
  });

+  this.add('/socket.io.v', { mime: mime.js }, function (path, callback) {
+    build(self.manager.get('transports'), callback);
+  });
+
  // allow custom builds based on url paths
  this.add('/socket.io+', { mime: mime.js }, function (path, callback) {
    var available = self.manager.get('transports')
-      , matches = bundle.exec(path)
+      , matches = path.match(bundle)
      , transports = [];

    if (!matches) return callback('No valid transports');
@@ -217,7 +222,7 @@ Static.prototype.has = function (path) {
    , i = keys.length;
 
  while (i--) {
-    if (!!~path.indexOf(keys[i])) return this.paths[keys[i]];
+    if (-~path.indexOf(keys[i])) return this.paths[keys[i]];
  }

  return false;
@@ -271,7 +276,13 @@ Static.prototype.write = function (path, req, res) {
  function write (status, headers, content, encoding) {
    try {
      res.writeHead(status, headers || undefined);
-      res.end(content || '', encoding || undefined);
+
+      // only write content if it's not a HEAD request and we actually have
+      // some content to write (304's doesn't have content).
+      res.end(
+          req.method !== 'HEAD' && content ? content : ''
+        , encoding || undefined
+      );
    } catch (e) {}
  }

@@ -291,19 +302,28 @@ Static.prototype.write = function (path, req, res) {
    var accept = req.headers['accept-encoding'] || ''
      , gzip = !!~accept.toLowerCase().indexOf('gzip')
      , mime = reply.mime
+      , versioned = reply.versioned
      , headers = {
          'Content-Type': mime.type
      };

    // check if we can add a etag
-    if (self.manager.enabled('browser client etag') && reply.etag) {
+    if (self.manager.enabled('browser client etag') && reply.etag && !versioned) {
      headers['Etag'] = reply.etag;
    }

-    // check if we can send gzip data
+    // see if we need to set Expire headers because the path is versioned
+    if (versioned) {
+      var expires = self.manager.get('browser client expires');
+      headers['Cache-Control'] = 'private, x-gzip-ok="", max-age=' + expires;
+      headers['Date'] = new Date().toUTCString();
+      headers['Expires'] = new Date(Date.now() + (expires * 1000)).toUTCString();
+    }
+
    if (gzip && reply.gzip) {
      headers['Content-Length'] = reply.gzip.length;
      headers['Content-Encoding'] = 'gzip';
+      headers['Vary'] = 'Accept-Encoding';
      write(200, headers, reply.gzip.content, mime.encoding);
    } else {
      headers['Content-Length'] = reply.length;
@@ -342,6 +362,7 @@ Static.prototype.write = function (path, req, res) {
          , length: content.length
          , mime: details.mime
          , etag: etag || client.version
+          , versioned: versioning.test(path)
        };

      // check if gzip is enabled
--- a/lib/stores/redis.js
+++ b/lib/stores/redis.js
@@ -84,6 +84,9 @@ function Redis (opts) {
  }

  Store.call(this, opts);
+
+  this.sub.setMaxListeners(0);
+  this.setMaxListeners(0);
 };

 /**
--- a/lib/transports/flashsocket.js
+++ b/lib/transports/flashsocket.js
@@ -49,9 +49,9 @@ FlashSocket.prototype.name = 'flashsocket';
 * @api private
 */

-var server;

 FlashSocket.init = function (manager) {
+  var server;
  function create () {
    server = require('policyfile').createServer({ 
      log: function(msg){
@@ -80,10 +80,15 @@ FlashSocket.init = function (manager) {
  // destory the server and create a new server
  manager.on('set:flash policy port', function (value, key) {
    var transports = manager.get('transports');
-
-    if (server && server.port !== value && ~transports.indexOf('flashsocket')) {
-      // destroy the server and rebuild it on a new port
-      server.close();
+    if (~transports.indexOf('flashsocket')) {
+      if (server) {
+        if (server.port === value) return;
+        // destroy the server and rebuild it on a new port
+        try {
+          server.close();
+        }
+        catch (e) { /* ignore exception. could e.g. be that the server isn't started yet */ }
+      }
      create();
    }
  });
@@ -94,7 +99,6 @@ FlashSocket.init = function (manager) {
      create();
    }
  });
-
  // check if we need to initialize at start
  if (~manager.get('transports').indexOf('flashsocket')){
    create();
--- a/lib/transports/htmlfile.js
+++ b/lib/transports/htmlfile.js
@@ -52,7 +52,7 @@ HTMLFile.prototype.handleRequest = function (req) {

  if (req.method == 'GET') {
    req.res.writeHead(200, {
-        'Content-Type': 'text/html'
+        'Content-Type': 'text/html; charset=UTF-8'
      , 'Connection': 'keep-alive'
      , 'Transfer-Encoding': 'chunked'
    });
--- a/lib/transports/http.js
+++ b/lib/transports/http.js
@@ -51,6 +51,11 @@ HTTPTransport.prototype.handleRequest = function (req) {

    req.on('data', function (data) {
      buffer += data;
+
+      if (Buffer.byteLength(buffer) >= self.manager.get('destroy buffer size')) {
+        buffer = '';
+        req.connection.destroy();
+      }
    });

    req.on('end', function () {
@@ -60,13 +65,15 @@ HTTPTransport.prototype.handleRequest = function (req) {
      self.onData(self.postEncoded ? qs.parse(buffer).d : buffer);
    });

+    // prevent memory leaks for uncompleted requests
+    req.on('close', function () {
+      buffer = '';
+    });
+
    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';
    }
  } else {
    this.response = req.res;
--- a/lib/transports/jsonp-polling.js
+++ b/lib/transports/jsonp-polling.js
@@ -54,6 +54,24 @@ JSONPPolling.prototype.name = 'jsonppolling';

 JSONPPolling.prototype.postEncoded = true;

+/**
+ * Handles incoming data.
+ * Due to a bug in \n handling by browsers, we expect a JSONified string.
+ *
+ * @api private
+ */
+
+JSONPPolling.prototype.onData = function (data) {
+  try {
+    data = JSON.parse(data);
+  } catch (e) {
+    this.error('parse', 'reconnect');
+    return;
+  }
+
+  HTTPPolling.prototype.onData.call(this, data);
+};
+
 /**
 * Performs the write.
 *
--- a/lib/transports/websocket/default.js
+++ b/lib/transports/websocket/default.js
@@ -88,8 +88,10 @@ WebSocket.prototype.onSocketConnect = function () {
    return;
  }

-  var origin = this.req.headers.origin
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+  var origin = this.req.headers['origin']
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
               + '://' + this.req.headers.host + this.req.url
    , waitingForNonce = false;

--- a/lib/transports/websocket/hybi-07-12.js
+++ b/lib/transports/websocket/hybi-07-12.js
@@ -41,7 +41,13 @@ function WebSocket (mng, data, req) {
  });
  this.parser.on('ping', function () {
    // version 8 ping => pong
-    self.socket.write('\u008a\u0000');
+    try {
+      self.socket.write('\u008a\u0000');
+    }
+    catch (e) {
+      self.end();
+      return;
+    }
  });
  this.parser.on('close', function () {
    self.end();
@@ -85,14 +91,17 @@ WebSocket.prototype.protocolVersion = '07-12';
 WebSocket.prototype.onSocketConnect = function () {
  var self = this;

-  if (this.req.headers.upgrade !== 'websocket') {
+  if (typeof this.req.headers.upgrade === 'undefined' || 
+      this.req.headers.upgrade.toLowerCase() !== 'websocket') {
    this.log.warn(this.name + ' connection invalid');
    this.end();
    return;
  }

  var origin = this.req.headers['sec-websocket-origin']
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
               + '://' + this.req.headers.host + this.req.url;
  
  if (!this.verifyOrigin(origin)) {
@@ -152,6 +161,7 @@ WebSocket.prototype.verifyOrigin = function (origin) {
  if (origin) {
    try {
      var parts = url.parse(origin);
+      parts.port = parts.port || 80;
      var ok =
        ~origins.indexOf(parts.hostname + ':' + parts.port) ||
        ~origins.indexOf(parts.hostname + ':*') ||
@@ -177,7 +187,13 @@ WebSocket.prototype.verifyOrigin = function (origin) {
 WebSocket.prototype.write = function (data) {
  if (this.open) {
    var buf = this.frame(0x81, data);
-    this.socket.write(buf, 'binary');
+    try {
+      this.socket.write(buf, 'binary');
+    }
+    catch (e) {
+      this.end();
+      return;
+    }
    this.log.debug(this.name + ' writing', data);
  }
 };
@@ -492,7 +508,9 @@ Parser.prototype.expect = function(what, length, handler) {
 */

 Parser.prototype.processPacket = function (data) {
-  if ((data[0] & 0x70) != 0) this.error('reserved fields must be empty');
+  if ((data[0] & 0x70) != 0) {
+    this.error('reserved fields must be empty');
+  }
  this.state.lastFragment = (data[0] & 0x80) == 0x80; 
  this.state.masked = (data[1] & 0x80) == 0x80;
  var opcode = data[0] & 0xf;
--- a/lib/transports/websocket/hybi-16.js
+++ b/lib/transports/websocket/hybi-16.js
@@ -41,7 +41,13 @@ function WebSocket (mng, data, req) {
  });
  this.parser.on('ping', function () {
    // version 8 ping => pong
-    self.socket.write('\u008a\u0000');
+    try {
+      self.socket.write('\u008a\u0000');
+    }
+    catch (e) {
+      self.end();
+      return;
+    }
  });
  this.parser.on('close', function () {
    self.end();
@@ -85,14 +91,17 @@ WebSocket.prototype.protocolVersion = '16';
 WebSocket.prototype.onSocketConnect = function () {
  var self = this;

-  if (this.req.headers.upgrade !== 'websocket') {
+  if (typeof this.req.headers.upgrade === 'undefined' || 
+      this.req.headers.upgrade.toLowerCase() !== 'websocket') {
    this.log.warn(this.name + ' connection invalid');
    this.end();
    return;
  }

  var origin = this.req.headers['origin']
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
               + '://' + this.req.headers.host + this.req.url;
  
  if (!this.verifyOrigin(origin)) {
@@ -152,6 +161,7 @@ WebSocket.prototype.verifyOrigin = function (origin) {
  if (origin) {
    try {
      var parts = url.parse(origin);
+      parts.port = parts.port || 80;
      var ok =
        ~origins.indexOf(parts.hostname + ':' + parts.port) ||
        ~origins.indexOf(parts.hostname + ':*') ||
@@ -177,7 +187,13 @@ WebSocket.prototype.verifyOrigin = function (origin) {
 WebSocket.prototype.write = function (data) {
  if (this.open) {
    var buf = this.frame(0x81, data);
-    this.socket.write(buf, 'binary');
+    try {
+      this.socket.write(buf, 'binary');
+    }
+    catch (e) {
+      this.end();
+      return;
+    }
    this.log.debug(this.name + ' writing', data);
  }
 };
@@ -492,7 +508,10 @@ Parser.prototype.expect = function(what, length, handler) {
 */

 Parser.prototype.processPacket = function (data) {
-  if ((data[0] & 0x70) != 0) this.error('reserved fields must be empty');
+  if ((data[0] & 0x70) != 0) {
+    this.error('reserved fields must be empty');
+    return;
+  } 
  this.state.lastFragment = (data[0] & 0x80) == 0x80; 
  this.state.masked = (data[1] & 0x80) == 0x80;
  var opcode = data[0] & 0xf;
--- a/lib/transports/xhr-polling.js
+++ b/lib/transports/xhr-polling.js
@@ -59,11 +59,8 @@ XHRPolling.prototype.doWrite = function (data) {

  if (origin) {
    // https://developer.mozilla.org/En/HTTP_Access_Control
-    headers['Access-Control-Allow-Origin'] = '*';
-
-    if (this.req.headers.cookie) {
-      headers['Access-Control-Allow-Credentials'] = 'true';
-    }
+    headers['Access-Control-Allow-Origin'] = origin;
+    headers['Access-Control-Allow-Credentials'] = 'true';
  }

  this.response.writeHead(200, headers);
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "socket.io"
-  , "version": "0.8.5"
+  , "version": "0.9.2"
  , "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,15 +16,20 @@
      , "url": "https://github.com/LearnBoost/socket.io.git"
    }
  , "dependencies": {
-        "socket.io-client": "0.8.5"
+        "socket.io-client": "0.9.2"
      , "policyfile": "0.0.4"
-      , "redis": "0.6.6"
+      , "redis": "0.6.7"
    }
  , "devDependencies": {
-        "expresso": "0.7.7"
+        "expresso": "0.9.2"
      , "should": "0.0.4"
-      , "assertvanish": "0.0.3-1"
+      , "benchmark": "0.2.2"
+      , "microtime": "0.1.3-1"
+      , "colors": "0.5.1"
    }
  , "main": "index"
  , "engines": { "node": ">= 0.4.0" }
+  , "scripts": {
+        "test": "make test"
+    }
 }
--- a/support/node-websocket-client/lib/websocket.js
+++ b/support/node-websocket-client/lib/websocket.js
@@ -5,7 +5,7 @@ var events = require('events');
 var http = require('http');
 var net = require('net');
 var urllib = require('url');
-var sys = require('sys');
+var sys = require('util');

 var FRAME_NO = 0;
 var FRAME_LO = 1;
@@ -347,7 +347,6 @@ var WebSocket = function(url, proto, opts) {
    // that we've closed.
    var finishClose = self.finishClose = function() {
        readyState = CLOSED;
-
        if (stream) {
            stream.end();
            stream.destroy();
@@ -469,31 +468,54 @@ var WebSocket = function(url, proto, opts) {
        //      that http.Client passes its constructor arguments through,
        //      un-inspected to net.Stream.connect(). The latter accepts a
        //      string as its first argument to connect to a UNIX socket.
-        var httpClient = undefined;
+        var opt = {};
+        var agent = null;
        switch (getUrlScheme(url)) {
        case 'ws':
            var u = urllib.parse(url);
-            httpClient = http.createClient(u.port || 80, u.hostname);
-            httpPath = (u.pathname || '/') + (u.search || '');
-            httpHeaders.Host = u.hostname + (u.port ? (":" + u.port) : "");
+            agent = new http.Agent({
+                host: u.hostname,
+                port: u.port || 80
+            });
+            opt.agent = agent;
+            opt.host = u.hostname;
+            opt.port = u.port || 80;
+            opt.path = (u.pathname || '/') + (u.search || '');
+            opt.headers = httpHeaders;
            break;

        case 'ws+unix':
            var sockPath = url.substring('ws+unix://'.length, url.length);
-            httpClient = http.createClient(sockPath);
-            httpHeaders.Host = 'localhost';
+            var u = urllib.parse(url);
+            agent = new http.Agent({
+                host: 'localhost',
+                port: sockPath
+            });
+            opt.agent = agent;
+            opt.host = 'localhost';
+            opt.path = sockPath;
+            opt.headers = httpHeaders;
            break;

        default:
            throw new Error('Invalid URL scheme \'' + urlScheme + '\' specified.');
        }

-        httpClient.on('upgrade', (function() {
+        var httpReq = http.request(opt, function() { });
+        var upgradeHandler = (function() {
            var data = undefined;

            return function(req, s, head) {
+                req.socket.setNoDelay(true);
                stream = s;

+                if (readyState == CLOSED) {
+                    stream.end();
+                    stream.destroy();
+                    stream = undefined;
+                    return;
+                }
+
                stream.on('data', function(d) {
                    if (d.length <= 0) {
                        return;
@@ -547,7 +569,7 @@ var WebSocket = function(url, proto, opts) {
                        //
                        // XXX: This is lame. We should only remove the listeners
                        //      that we added.
-                        httpClient.removeAllListeners('upgrade');
+                        httpReq.removeAllListeners('upgrade');
                        stream.removeAllListeners('data');
                        stream.on('data', dataListener);

@@ -575,13 +597,9 @@ var WebSocket = function(url, proto, opts) {

                stream.emit('data', head);
            };
-        })());
-        httpClient.on('error', function(e) {
-            httpClient.end();
-            errorListener(e);
-        });
-
-        var httpReq = httpClient.request(httpPath, httpHeaders);
+        })();
+        agent.on('upgrade', upgradeHandler); // node v0.4
+        httpReq.on('upgrade', upgradeHandler); // node v0.5+

        httpReq.write(challenge, 'binary');
        httpReq.end();
--- a/test/common.js
+++ b/test/common.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var io = require('socket.io')
+var io = require('../')
  , parser = io.parser
  , http = require('http')
  , https = require('https')
@@ -91,8 +91,21 @@ HTTPClient.prototype.request = function (path, opts, fn) {
 */

 HTTPClient.prototype.end = function () {
-  this.agent.sockets.forEach(function (socket) {
-    socket.end();
+  // node <v0.5 compat
+  if (this.agent.sockets.forEach) {
+      this.agent.sockets.forEach(function (socket) {
+        if (socket.end) socket.end();
+      });
+      return;
+  }
+  // node >=v0.5 compat
+  var self = this;
+  Object.keys(this.agent.sockets).forEach(function (socket) {
+    for (var i = 0, l = self.agent.sockets[socket].length; i < l; ++i) {
+      if (self.agent.sockets[socket][i]._handle) {
+        self.agent.sockets[socket][i]._handle.socket.end();
+      }
+    }
  });
 };

@@ -147,6 +160,24 @@ HTTPClient.prototype.post = function (path, data, opts, fn) {
  return this.request(path, opts, fn);
 };

+/**
+ * Issue a HEAD request
+ *
+ * @api private
+ */
+
+HTTPClient.prototype.head = function (path, opts, fn) {
+  if ('function' == typeof opts) {
+    fn = opts;
+    opts = {};
+  }
+
+  opts = opts || {};
+  opts.method = 'HEAD';
+
+  return this.request(path, opts, fn);
+};
+
 /**
 * Performs a handshake (GET) request
 *
@@ -179,7 +210,6 @@ client = function (port) {
 */

 create = function (cl) {
-  console.log('');
  var manager = io.listen(cl.port);
  manager.set('client store expiration', 0);
  return manager;
@@ -197,7 +227,7 @@ function WSClient (port, sid, transport) {
  this.transportName = transport || 'websocket';
  WebSocket.call(
      this
-    , 'ws://localhost:' + port + '/socket.io/' 
+    , 'ws://localhost:' + port + '/socket.io/'
        + io.protocol + '/' + this.transportName + '/' + sid
  );
 };
--- a/test/hybi-common.js
+++ b/test/hybi-common.js
@@ -43,7 +43,7 @@ mask = function(buf, maskString) {
  if (typeof buf == 'string') buf = new Buffer(buf);
  var mask = getBufferFromHexString(maskString || '34 83 a8 68');
  for (var i = 0; i < buf.length; ++i) {
-    buf[i] ^= mask[i % 4];    
+    buf[i] ^= mask[i % 4];
  }
  return buf;
 }
@@ -51,20 +51,20 @@ mask = function(buf, maskString) {
 /**
 * Returns a hex string representing the length of a message
 */
- 
-getHybiLengthAsHexString = function(len, masked) {  
+
+getHybiLengthAsHexString = function(len, masked) {
  if (len < 126) {
    var buf = new Buffer(1);
-    buf[0] = (masked ? 0x80 : 0) | len;
+    buf[0] = (masked ? 0x80 : 0) | len;
  }
  else if (len < 65536) {
    var buf = new Buffer(3);
-    buf[0] = (masked ? 0x80 : 0) | 126;
+    buf[0] = (masked ? 0x80 : 0) | 126;
    getBufferFromHexString(pack(4, len)).copy(buf, 1);
  }
  else {
    var buf = new Buffer(9);
-    buf[0] = (masked ? 0x80 : 0) | 127;
+    buf[0] = (masked ? 0x80 : 0) | 127;
    getBufferFromHexString(pack(16, len)).copy(buf, 1);
  }
  return getHexStringFromBuffer(buf);
@@ -94,6 +94,6 @@ pack = function(length, number) {
 * Left pads the string 's' to a total length of 'n' with char 'c'.
 */

-padl = function(s, n, c) { 
+padl = function(s, n, c) {
  return new Array(1 + n - s.length).join(c) + s;
 }
--- a/test/io.test.js
+++ b/test/io.test.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , fs = require('fs')
  , http = require('http')
  , https = require('https')
@@ -116,10 +116,10 @@ module.exports = {
        io.server.close();
        done();
      });
+      done();
    } catch (e) {
      e.should.match(/EACCES/);
      done();
    }
  }
-
 };
--- a/test/manager.test.js
+++ b/test/manager.test.js
@@ -8,7 +8,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , http = require('http')
  , should = require('./common')
  , ports = 15100;
@@ -117,6 +117,7 @@ module.exports = {
    io.disable('foo');

    calls.should.eql(3);
+
    done();
  },

@@ -276,6 +277,23 @@ module.exports = {
    });
  },

+  'test that a referer with implicit port 80 is accepted for foo.bar.com:80 origin': function (done) {
+    var port = ++ports
+      , io = sio.listen(port)
+      , cl = client(port);
+
+    io.configure(function () {
+      io.set('origins', 'foo.bar.com:80');
+    });
+
+    cl.get('/socket.io/{protocol}', { headers: { referer: 'http://foo.bar.com/something' } }, function (res, data) {
+      res.statusCode.should.eql(200);
+      cl.end();
+      io.server.close();
+      done();
+    });
+  },
+
  'test that erroneous referer is denied for addr:* origin': function (done) {
    var port = ++ports
      , io = sio.listen(port)
@@ -338,7 +356,7 @@ module.exports = {

    cl.get('/socket.io/{protocol}/', { headers:headers }, function (res, data) {
      res.statusCode.should.eql(200);
-      res.headers['access-control-allow-origin'].should.eql('*');
+      res.headers['access-control-allow-origin'].should.eql('http://example.org:1337');
      res.headers['access-control-allow-credentials'].should.eql('true');

      cl.end();
@@ -426,8 +444,8 @@ module.exports = {

  'test disabling heartbeats': function (done) {
    var port = ++ports
-      , io = sio.listen(port)
      , cl = client(port)
+      , io = create(cl)
      , messages = 0
      , beat = false
      , ws;
@@ -446,9 +464,8 @@ module.exports = {

      socket.on('disconnect', function (reason) {
        beat.should.be.false;
-
-        cl.end();
        ws.finishClose();
+        cl.end();
        io.server.close();
        done();
      });
@@ -505,8 +522,10 @@ module.exports = {
    io.rooms.foo.length.should.equal(2);
    io.rooms.bar.length.should.equal(2);

-    io.server.close();
-    done();
+    process.nextTick(function() {
+      io.server.close();
+      done();
+    });
  },

  'test passing options directly to the Manager through listen': function (done) {
@@ -515,7 +534,56 @@ module.exports = {

    io.get('resource').should.equal('/my resource');
    io.get('custom').should.equal('opt');
-    io.server.close();
-    done();
+    process.nextTick(function() {
+      io.server.close();
+      done();
+    });
+  },
+
+  'test disabling the log': function (done) {
+    var port = ++ports
+      , io = sio.listen(port, { log: false })
+      , _console = console.log
+      , calls = 0;
+
+    // the logger uses console.log to output data, override it to see if get's
+    // used
+    console.log = function () { ++calls };
+
+    io.log.debug('test');
+    io.log.log('testing');
+
+    console.log = _console;
+    calls.should.equal(0);
+
+    process.nextTick(function() {
+      io.server.close();
+      done();
+    });
+  },
+
+  'test disabling logging with colors': function (done) {
+     var port = ++ports
+      , io = sio.listen(port, { 'log colors': false })
+      , _console = console.log
+      , calls = 0;
+
+    // the logger uses console.log to output data, override it to see if get's
+    // used
+    console.log = function (data) {
+      ++calls;
+      data.indexOf('\033').should.equal(-1);
+    };
+
+    io.log.debug('test');
+    io.log.log('testing');
+
+    console.log = _console;
+    calls.should.equal(2);
+
+    process.nextTick(function() {
+      io.server.close();
+      done();
+    });
  }
 };
--- a/test/namespace.test.js
+++ b/test/namespace.test.js
@@ -131,7 +131,7 @@ module.exports = {
        if (data.endpoint == '/a') {
          data.type.should.eql('error');
          data.reason.should.eql('unauthorized')
-          
+
          cl.end();
          ws.finishClose();
          io.server.close()
@@ -154,6 +154,9 @@ module.exports = {

    io.of('a')
      .on('connection', function (socket){
+        if (connect < 2) {
+          return;
+        }
        socket.broadcast.emit('b', 'test');
        socket.broadcast.json.emit('json', {foo:'bar'});
        socket.broadcast.send('foo');
@@ -163,7 +166,6 @@ module.exports = {
      connect.should.equal(2);
      message.should.equal(1);
      events.should.equal(2);
-
      cl.end();
      ws1.finishClose();
      ws2.finishClose();
@@ -173,16 +175,19 @@ module.exports = {

    cl.handshake(function (sid) {
     ws1 = websocket(cl, sid);
-
-      ws1.on('open', function() {
-        ws1.packet({
-            type: 'connect'
-          , endpoint: 'a'
-        });
-      });
-
      ws1.on('message', function (data) {
        if (data.type === 'connect') {
+          if (connect == 0) {
+            cl.handshake(function (sid) {
+              ws2 = websocket(cl, sid);
+              ws2.on('open', function () {
+                ws2.packet({
+                    type: 'connect'
+                  , endpoint: 'a'
+                });
+              });
+            });
+          }
          ++connect;
          if (++calls === expected) finish();
        }
@@ -197,17 +202,12 @@ module.exports = {
          if (++calls === expected) finish();
        }
      });
-
-      cl.handshake(function (sid) {
-        ws2 = websocket(cl, sid);
-
-        ws2.on('open', function () {
-          ws2.packet({
-              type: 'connect'
-            , endpoint: 'a'
-          });
+      ws1.on('open', function() {
+        ws1.packet({
+            type: 'connect'
+          , endpoint: 'a'
        });
-      })
+      });
    })
  },

@@ -243,5 +243,44 @@ module.exports = {
        }
      });
    })
+  },
+
+  'ignoring blacklisted events': function (done) {
+    var cl = client(++ports)
+      , io = create(cl)
+      , calls = 0
+      , ws;
+
+    io.set('heartbeat interval', 1);
+    io.set('blacklist', ['foobar']);
+
+    io.sockets.on('connection', function (socket) {
+      socket.on('foobar', function () {
+         calls++;
+      });
+    });
+
+    cl.handshake(function (sid) {
+      ws = websocket(cl, sid);
+
+      ws.on('open', function (){
+         ws.packet({
+            type: 'event'
+          , name: 'foobar'
+          , endpoint: ''
+        });
+      });
+
+      ws.on('message', function (data) {
+        if (data.type === 'heartbeat') {
+          cl.end();
+          ws.finishClose();
+          io.server.close();
+
+          calls.should.equal(0);
+          done();
+        }
+      });
+    });
  }
 };
--- a/test/parser.test.js
+++ b/test/parser.test.js
@@ -3,7 +3,7 @@
 * Test dependencies.
 */

-var parser = require('socket.io').parser
+var parser = require('../').parser
  , decode = parser.decode
  , should = require('./common');

--- a/test/socket.js
+++ b/test/socket.js
@@ -1,15 +0,0 @@
-
-/**
- * Test dependencies.
- */
-
-var sio = require('socket.io')
-  , should = require('./common');
-
-/**
- * Test.
- */
-
-module.exports = {
-
-};
--- a/test/static.test.js
+++ b/test/static.test.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , should = require('./common')
  , ports = 15400;

@@ -24,12 +24,16 @@ module.exports = {
      , io = sio.listen(port);

    (!!io.static.has('/socket.io.js')).should.be.true;
-    (!!io.static.has('/socket.io+')).should.be.true;
+    (!!io.static.has('/socket.io.v1.0.0.js')).should.be.true;
+    (!!io.static.has('/socket.io+xhr-polling.js')).should.be.true;
+    (!!io.static.has('/socket.io+xhr-polling.v1.0.0.js')).should.be.true;
    (!!io.static.has('/static/flashsocket/WebSocketMain.swf')).should.be.true;
    (!!io.static.has('/static/flashsocket/WebSocketMainInsecure.swf')).should.be.true;

-    io.server.close();
-    done();
+    process.nextTick(function() {
+      io.server.close();
+      done();
+    });
  },

  'test that static files are correctly looked up': function (done) {
@@ -39,8 +43,10 @@ module.exports = {
    (!!io.static.has('/socket.io.js')).should.be.true;
    (!!io.static.has('/invalidfilehereplease.js')).should.be.false;

-    io.server.close();
-    done();
+    process.nextTick(function() {
+      io.server.close();
+      done();
+    });
  },

  'test that the client is served': function (done) {
@@ -88,7 +94,7 @@ module.exports = {

  'test that the client is build with the enabled transports': function (done) {
    var port = ++ports
-      , io = sio.listen(port) 
+      , io = sio.listen(port)
      , cl = client(port);

    io.set('transports', ['websocket']);
@@ -455,6 +461,89 @@ module.exports = {
      io.server.close();
      done();
    });
-  }
+  },

+  'test that HEAD requests work': function (done) {
+    var port = ++ports
+      , io = sio.listen(port)
+      , cl = client(port);
+
+    cl.head('/socket.io/socket.io.js', function (res, data) {
+      res.headers['content-type'].should.eql('application/javascript');
+      res.headers['content-length'].should.match(/([0-9]+)/);
+
+      data.should.eql('');
+
+      cl.end();
+      io.server.close()
+      done();
+    });
+  },
+
+  'test that a versioned client is served': function (done) {
+    var port = ++ports
+      , io = sio.listen(port)
+      , cl = client(port);
+
+    cl.get('/socket.io/socket.io.v0.8.9.js', function (res, data) {
+      res.headers['content-type'].should.eql('application/javascript');
+      res.headers['content-length'].should.match(/([0-9]+)/);
+      res.headers['cache-control']
+        .indexOf(io.get('browser client expires')).should.be.above(-1);
+
+      data.should.match(/XMLHttpRequest/);
+
+      cl.end();
+      io.server.close();
+      done();
+    });
+  },
+
+  'test that a custom versioned build client is served': function (done) {
+    var port = ++ports
+      , io = sio.listen(port)
+      , cl = client(port);
+
+    io.set('browser client expires', 1337);
+
+    cl.get('/socket.io/socket.io+websocket.v0.8.10.js', function (res, data) {
+      res.headers['content-type'].should.eql('application/javascript');
+      res.headers['content-length'].should.match(/([0-9]+)/);
+      res.headers['cache-control']
+        .indexOf(io.get('browser client expires')).should.be.above(-1);
+
+      data.should.match(/XMLHttpRequest/);
+      data.should.match(/WS\.prototype\.name/);
+      data.should.not.match(/Flashsocket\.prototype\.name/);
+      data.should.not.match(/HTMLFile\.prototype\.name/);
+      data.should.not.match(/JSONPPolling\.prototype\.name/);
+      data.should.not.match(/XHRPolling\.prototype\.name/);
+
+      cl.end();
+      io.server.close();
+      done();
+    });
+  },
+
+  'test that etags are ignored for versioned requests': function (done) {
+    var port = ++ports
+      , io = sio.listen(port)
+      , cl = client(port);
+
+    io.enable('browser client etag');
+
+    cl.get('/socket.io/socket.io.v0.8.9.js', function (res, data) {
+      should.strictEqual(res.headers.etag, undefined);
+      res.headers['content-type'].should.eql('application/javascript');
+      res.headers['content-length'].should.match(/([0-9]+)/);
+      res.headers['cache-control']
+        .indexOf(io.get('browser client expires')).should.be.above(-1);
+
+      data.should.match(/XMLHttpRequest/);
+
+      cl.end();
+      io.server.close();
+      done();
+    });
+  },
 };
--- a/test/stores.memory.test.js
+++ b/test/stores.memory.test.js
@@ -5,7 +5,7 @@
 * @api private
 */

-var sio = require('socket.io')
+var sio = require('../')
  , should = require('should')
  , MemoryStore = sio.MemoryStore;

@@ -45,7 +45,7 @@ module.exports = {

                client.set('b', 'c', function (err) {
                  should.strictEqual(err, null);
-                  
+
                  client.set('c', 'd', function (err) {
                    should.strictEqual(err, null);

--- a/test/stores.redis.test.js
+++ b/test/stores.redis.test.js
@@ -5,7 +5,7 @@
 * @api private
 */

-var sio = require('socket.io')
+var sio = require('../')
  , redis = require('redis')
  , should = require('should')
  , RedisStore = sio.RedisStore;
@@ -95,7 +95,7 @@ module.exports = {

                client.set('b', 'c', function (err) {
                  should.strictEqual(err, null);
-                  
+
                  client.set('c', 'd', function (err) {
                    should.strictEqual(err, null);

--- a/test/transports.flashsocket.test.js
+++ b/test/transports.flashsocket.test.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , net = require('net')
  , http = require('http')
  , should = require('./common')
@@ -30,7 +30,7 @@ function FlashSocket (port, sid) {

  WebSocket.call(
      this
-    , 'ws://localhost:' + port + '/socket.io/' 
+    , 'ws://localhost:' + port + '/socket.io/'
        + sio.protocol + '/flashsocket/' + sid
  );
 };
@@ -168,13 +168,18 @@ module.exports = {
  'flashsocket identifies as flashsocket': function (done) {
    var cl = client(++ports)
      , io = create(cl)
-      , messages = 0
      , ws;
+
    io.set('transports', ['flashsocket']);
    io.sockets.on('connection', function (socket) {
      socket.manager.transports[socket.id].name.should.equal('flashsocket');
+      ws.finishClose();
+      cl.end();
+      io.flashPolicyServer.close();
+      io.server.close();
      done();
    });
+
    cl.handshake(function (sid) {
      ws = websocket(cl, sid, 'flashsocket');
    });
--- a/test/transports.htmlfile.test.js
+++ b/test/transports.htmlfile.test.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , should = require('./common')
  , HTTPClient = should.HTTPClient
  , parser = sio.parser
--- a/test/transports.jsonp-polling.test.js
+++ b/test/transports.jsonp-polling.test.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , should = require('./common')
  , qs = require('querystring')
  , HTTPClient = should.HTTPClient
@@ -250,8 +250,7 @@ module.exports = {
    });
  },

-  'test the disconnection event when the client sends ?disconnect req':
-  function (done) {
+  'test the disconnection event when the client sends ?disconnect req': function (done) {
    var cl = client(++ports)
      , io = create(cl)
      , disconnected = false
@@ -279,12 +278,17 @@ module.exports = {
          msgs.should.have.length(1);
          msgs[0].should.eql({ type: 'disconnect', endpoint: '' });
          disconnected.should.be.true;
-          cl.end();
          io.server.close();
+          cl.end();
          done();
        });

-        cl.get('/socket.io/{protocol}/jsonp-polling/' + sid + '/?disconnect');
+        // with the new http bits in node 0.5, there's no guarantee that
+        // the previous request is actually dispatched (and received) before the following
+        // reset call is sent. to not waste more time on a workaround, a timeout is added.
+        setTimeout(function() {
+          cl.get('/socket.io/{protocol}/jsonp-polling/' + sid + '/?disconnect');
+        }, 500);
      });
    });
  },
@@ -323,7 +327,7 @@ module.exports = {
    io.sockets.on('connection', function (client) {
      cl.post(
          '/socket.io/{protocol}/jsonp-polling/' + sid
-        , parser.encodePacket({ type: 'disconnect' })
+        , JSON.stringify(parser.encodePacket({ type: 'disconnect' }))
        , function (res, data) {
            res.statusCode.should.eql(200);
            data.should.eql('1');
@@ -390,11 +394,11 @@ module.exports = {

      cl.post(
          '/socket.io/{protocol}/jsonp-polling/' + sid
-        , parser.encodePayload([
+        , JSON.stringify(parser.encodePayload([
              parser.encodePacket({ type: 'message', data: 'a' })
            , parser.encodePacket({ type: 'message', data: 'b' })
            , parser.encodePacket({ type: 'disconnect' })
-          ])
+          ]))
        , function (res, data) {
            res.statusCode.should.eql(200);
            data.should.eql('1');
@@ -504,7 +508,7 @@ module.exports = {

        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'connect', endpoint: '/woot' })
+          , JSON.stringify(parser.encodePacket({ type: 'connect', endpoint: '/woot' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');
@@ -585,21 +589,21 @@ module.exports = {
      cl.get('/socket.io/{protocol}/jsonp-polling/' + sid, function () {
        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'connect', endpoint: '/woot' })
+          , JSON.stringify(parser.encodePacket({ type: 'connect', endpoint: '/woot' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');

              cl.post(
                  '/socket.io/{protocol}/jsonp-polling/' + sid
-                , parser.encodePacket({ type: 'disconnect', endpoint: '/woot' })
+                , JSON.stringify(parser.encodePacket({ type: 'disconnect', endpoint: '/woot' }))
                , function (res, data) {
                    res.statusCode.should.eql(200);
                    data.should.eql('1');

                    cl.post(
                        '/socket.io/{protocol}/jsonp-polling/' + sid
-                      , parser.encodePacket({ type: 'message', data: 'ferret' })
+                      , JSON.stringify(parser.encodePacket({ type: 'message', data: 'ferret' }))
                      , function (res, data) {
                          res.statusCode.should.eql(200);
                          data.should.eql('1');
@@ -656,7 +660,7 @@ module.exports = {

        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'connect', endpoint: '/a' })
+          , JSON.stringify(parser.encodePacket({ type: 'connect', endpoint: '/a' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');
@@ -665,7 +669,7 @@ module.exports = {

        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'connect', endpoint: '/b' })
+          , JSON.stringify(parser.encodePacket({ type: 'connect', endpoint: '/b' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');
@@ -721,7 +725,7 @@ module.exports = {
      cl.get('/socket.io/{protocol}/jsonp-polling/' + sid, function (res, data) {
        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'message', data: '' })
+          , JSON.stringify(parser.encodePacket({ type: 'message', data: '' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');
@@ -730,14 +734,14 @@ module.exports = {

        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'connect', endpoint: '/a' })
+          , JSON.stringify(parser.encodePacket({ type: 'connect', endpoint: '/a' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');

              cl.post(
                  '/socket.io/{protocol}/jsonp-polling/' + sid
-                , parser.encodePacket({ type: 'message', endpoint: '/a', data: 'a' })
+                , JSON.stringify(parser.encodePacket({ type: 'message', endpoint: '/a', data: 'a' }))
                , function (res, data) {
                    res.statusCode.should.eql(200);
                    data.should.eql('1');
@@ -748,14 +752,14 @@ module.exports = {

        cl.post(
            '/socket.io/{protocol}/jsonp-polling/' + sid
-          , parser.encodePacket({ type: 'connect', endpoint: '/b' })
+          , JSON.stringify(parser.encodePacket({ type: 'connect', endpoint: '/b' }))
          , function (res, data) {
              res.statusCode.should.eql(200);
              data.should.eql('1');

              cl.post(
                  '/socket.io/{protocol}/jsonp-polling/' + sid
-                , parser.encodePacket({ type: 'message', endpoint: '/b', data: 'b' })
+                , JSON.stringify(parser.encodePacket({ type: 'message', endpoint: '/b', data: 'b' }))
                , function (res, data) {
                    res.statusCode.should.eql(200);
                    data.should.eql('1');
--- a/test/transports.websocket.hybi07-12.parser.test.js
+++ b/test/transports.websocket.hybi07-12.parser.test.js
@@ -2,7 +2,7 @@
 * Test dependencies.
 */

-var assert = require('assert'); 
+var assert = require('assert');
 var Parser = require('../lib/transports/websocket/hybi-07-12.js').Parser;
 require('./hybi-common');

@@ -14,38 +14,38 @@ module.exports = {
  'can parse unmasked text message': function() {
    var p = new Parser();
    var packet = '81 05 48 65 6c 6c 6f';
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
      assert.equal('Hello', data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
  'can parse close message': function() {
    var p = new Parser();
    var packet = '88 00';
-  
+
    var gotClose = false;
    p.on('close', function(data) {
      gotClose = true;
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotClose);
  },
  'can parse masked text message': function() {
    var p = new Parser();
    var packet = '81 93 34 83 a8 68 01 b9 92 52 4f a1 c6 09 59 e6 8a 52 16 e6 cb 00 5b a1 d5';
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
      assert.equal('5:::{"name":"echo"}', data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -54,13 +54,13 @@ module.exports = {
    var message = 'A';
    for (var i = 0; i < 300; ++i) message += (i % 5).toString();
    var packet = '81 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
      assert.equal(message, data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -75,7 +75,7 @@ module.exports = {
      gotData = true;
      assert.equal(message, data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -87,13 +87,13 @@ module.exports = {
    var msgpiece2 = message.substr(150);
    var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
    var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
    var gotData = false;
    p.on('data', function(data) {
-      gotData = true;      
+      gotData = true;
      assert.equal(message, data);
    });
-  
+
    p.add(getBufferFromHexString(packet1));
    p.add(getBufferFromHexString(packet2));
    assert.ok(gotData);
@@ -102,25 +102,25 @@ module.exports = {
    var p = new Parser();
    var message = 'Hello';
    var packet = '89 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
    var gotPing = false;
    p.on('ping', function(data) {
      gotPing = true;
      assert.equal(message, data);
    });
-    
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotPing);
  },
  'can parse a ping with no data': function() {
    var p = new Parser();
    var packet = '89 00';
-    
+
    var gotPing = false;
    p.on('ping', function(data) {
      gotPing = true;
    });
-    
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotPing);
  },
@@ -128,16 +128,16 @@ module.exports = {
    var p = new Parser();
    var message = 'A';
    for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
    var msgpiece1 = message.substr(0, 150);
    var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
    var pingMessage = 'Hello';
    var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
    var msgpiece2 = message.substr(150);
    var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
@@ -148,7 +148,7 @@ module.exports = {
      gotPing = true;
      assert.equal(pingMessage, data);
    });
-    
+
    p.add(getBufferFromHexString(packet1));
    p.add(getBufferFromHexString(pingPacket));
    p.add(getBufferFromHexString(packet2));
@@ -159,16 +159,16 @@ module.exports = {
    var p = new Parser();
    var message = 'A';
    for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
    var msgpiece1 = message.substr(0, 150);
    var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
    var pingMessage = 'Hello';
    var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
    var msgpiece2 = message.substr(150);
    var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
@@ -179,7 +179,7 @@ module.exports = {
      gotPing = true;
      assert.equal(pingMessage, data);
    });
-    
+
    var buffers = [];
    buffers = buffers.concat(splitBuffer(getBufferFromHexString(packet1)));
    buffers = buffers.concat(splitBuffer(getBufferFromHexString(pingPacket)));
@@ -195,7 +195,7 @@ module.exports = {
    var length = 100;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));

    var gotData = false;
@@ -203,7 +203,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -212,7 +212,7 @@ module.exports = {
    var length = 256;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));

    var gotData = false;
@@ -220,7 +220,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -229,7 +229,7 @@ module.exports = {
    var length = 200 * 1024;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));

    var gotData = false;
@@ -237,7 +237,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -246,7 +246,7 @@ module.exports = {
    var length = 200 * 1024;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, false) + ' ' + getHexStringFromBuffer(message);

    var gotData = false;
@@ -254,7 +254,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
--- a/test/transports.websocket.hybi16.parser.test.js
+++ b/test/transports.websocket.hybi16.parser.test.js
@@ -2,7 +2,7 @@
 * Test dependencies.
 */

-var assert = require('assert'); 
+var assert = require('assert');
 var Parser = require('../lib/transports/websocket/hybi-16.js').Parser;
 require('./hybi-common');

@@ -14,38 +14,38 @@ module.exports = {
  'can parse unmasked text message': function() {
    var p = new Parser();
    var packet = '81 05 48 65 6c 6c 6f';
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
      assert.equal('Hello', data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
  'can parse close message': function() {
    var p = new Parser();
    var packet = '88 00';
-  
+
    var gotClose = false;
    p.on('close', function(data) {
      gotClose = true;
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotClose);
  },
  'can parse masked text message': function() {
    var p = new Parser();
    var packet = '81 93 34 83 a8 68 01 b9 92 52 4f a1 c6 09 59 e6 8a 52 16 e6 cb 00 5b a1 d5';
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
      assert.equal('5:::{"name":"echo"}', data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -54,13 +54,13 @@ module.exports = {
    var message = 'A';
    for (var i = 0; i < 300; ++i) message += (i % 5).toString();
    var packet = '81 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
      assert.equal(message, data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -75,7 +75,7 @@ module.exports = {
      gotData = true;
      assert.equal(message, data);
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -87,13 +87,13 @@ module.exports = {
    var msgpiece2 = message.substr(150);
    var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
    var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
    var gotData = false;
    p.on('data', function(data) {
-      gotData = true;      
+      gotData = true;
      assert.equal(message, data);
    });
-  
+
    p.add(getBufferFromHexString(packet1));
    p.add(getBufferFromHexString(packet2));
    assert.ok(gotData);
@@ -102,25 +102,25 @@ module.exports = {
    var p = new Parser();
    var message = 'Hello';
    var packet = '89 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
    var gotPing = false;
    p.on('ping', function(data) {
      gotPing = true;
      assert.equal(message, data);
    });
-    
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotPing);
  },
  'can parse a ping with no data': function() {
    var p = new Parser();
    var packet = '89 00';
-    
+
    var gotPing = false;
    p.on('ping', function(data) {
      gotPing = true;
    });
-    
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotPing);
  },
@@ -128,16 +128,16 @@ module.exports = {
    var p = new Parser();
    var message = 'A';
    for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
    var msgpiece1 = message.substr(0, 150);
    var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
    var pingMessage = 'Hello';
    var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
    var msgpiece2 = message.substr(150);
    var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
@@ -148,7 +148,7 @@ module.exports = {
      gotPing = true;
      assert.equal(pingMessage, data);
    });
-    
+
    p.add(getBufferFromHexString(packet1));
    p.add(getBufferFromHexString(pingPacket));
    p.add(getBufferFromHexString(packet2));
@@ -159,16 +159,16 @@ module.exports = {
    var p = new Parser();
    var message = 'A';
    for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
    var msgpiece1 = message.substr(0, 150);
    var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
    var pingMessage = 'Hello';
    var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
    var msgpiece2 = message.substr(150);
    var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
    var gotData = false;
    p.on('data', function(data) {
      gotData = true;
@@ -179,7 +179,7 @@ module.exports = {
      gotPing = true;
      assert.equal(pingMessage, data);
    });
-    
+
    var buffers = [];
    buffers = buffers.concat(splitBuffer(getBufferFromHexString(packet1)));
    buffers = buffers.concat(splitBuffer(getBufferFromHexString(pingPacket)));
@@ -195,7 +195,7 @@ module.exports = {
    var length = 100;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));

    var gotData = false;
@@ -203,7 +203,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -212,7 +212,7 @@ module.exports = {
    var length = 256;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));

    var gotData = false;
@@ -220,7 +220,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -229,7 +229,7 @@ module.exports = {
    var length = 200 * 1024;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));

    var gotData = false;
@@ -237,7 +237,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
@@ -246,7 +246,7 @@ module.exports = {
    var length = 200 * 1024;
    var message = new Buffer(length);
    for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
    var packet = '82 ' + getHybiLengthAsHexString(length, false) + ' ' + getHexStringFromBuffer(message);

    var gotData = false;
@@ -254,7 +254,7 @@ module.exports = {
      gotData = true;
      assert.equal(originalMessage, getHexStringFromBuffer(data));
    });
-  
+
    p.add(getBufferFromHexString(packet));
    assert.ok(gotData);
  },
--- a/test/transports.websocket.test.js
+++ b/test/transports.websocket.test.js
--- a/test/transports.xhr-polling.test.js
+++ b/test/transports.xhr-polling.test.js
@@ -9,7 +9,7 @@
 * Test dependencies.
 */

-var sio = require('socket.io')
+var sio = require('../')
  , should = require('./common')
  , HTTPClient = should.HTTPClient
  , parser = sio.parser
@@ -220,7 +220,12 @@ module.exports = {
          done();
        });

-        cl.get('/socket.io/{protocol}/xhr-polling/' + sid + '/?disconnect');
+        // with the new http bits in node 0.5, there's no guarantee that
+        // the previous request is actually dispatched (and received) before the following
+        // reset call is sent. to not waste more time on a workaround, a timeout is added.
+        setTimeout(function() {
+          cl.get('/socket.io/{protocol}/xhr-polling/' + sid + '/?disconnect');
+        }, 500);
      });
    });
  },
@@ -763,7 +768,7 @@ module.exports = {
    var cl = client(++ports)
      , io = create(cl)
      , messages = 0;
-    
+
    io.configure(function () {
      io.set('polling duration', 0);
      io.set('close timeout', .1);
@@ -2647,8 +2652,8 @@ module.exports = {
      }, function (res, packs) {
        var headers = res.headers;

-        headers['access-control-allow-origin'].should.equal('*');
-        should.strictEqual(headers['access-control-allow-credentials'], undefined);
+        headers['access-control-allow-origin'].should.equal('http://localhost:3500');
+        headers['access-control-allow-credentials'].should.equal('true');

        packs.should.have.length(1);
        packs[0].type.should.eql('message');
@@ -2664,7 +2669,7 @@ module.exports = {
          }
        }, function (res, data) {
          var headers = res.headers;
-          headers['access-control-allow-origin'].should.equal('*');
+          headers['access-control-allow-origin'].should.equal('http://localhost:3500');
          headers['access-control-allow-credentials'].should.equal('true');

          data.should.equal('1');
@@ -2746,7 +2751,7 @@ module.exports = {
              }
          );
        });
-        
+
      });
    });
  }
Author	SHA1	Message	Date
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
Guillermo Rauch	204576c006	Make these 2 tests work both on 0.4 and 0.6	2012-02-26 21:51:22 -03:00
Guillermo Rauch	66ac425bf7	Release 0.9.0	2012-02-26 21:46:39 -03:00
Guillermo Rauch	a01e7e2256	Make tests pass on 0.4	2012-02-26 18:21:25 -03:00
Guillermo Rauch	47cfa5aadf	Fixed tests. All 250 passing.	2012-02-26 17:14:06 -03:00
Guillermo Rauch	ddd7f804af	Fixed cross-domain xhr tests.	2012-02-26 17:11:52 -03:00
Guillermo Rauch	8c1c7a24ef	Merge pull request #744 from ajaxorg/regexp-as-resource make it possible to use a regexp to match the socket.io resource URL	2012-02-09 09:38:03 -08:00
Fabian Jakobs	09b130f4cf	make it possible to use a regexp to match the socket.io resource URL. We need this because we have to prefix the socket.io URL with a variable ID.	2012-02-09 17:17:55 +01:00
Guillermo Rauch	b662704b0b	Merge pull request #737 from mixu/mixu/authfix2 Supplemental fix to gavinuhma/authfix, it looks like the same Access-Control-Origin logic is needed in the http and xhr-polling transports	2012-02-03 14:24:57 -08:00
Mikito Takada	304a4285ff	Supplemental fix to gavinuhma/authfix, it looks like the same Access-Control-Origin logic is needed in the http and xhr-polling transports	2012-02-03 12:20:40 -08:00
Guillermo Rauch	6074795b19	Updated express dep for windows compatibility.	2012-01-11 07:41:09 -08:00
Guillermo Rauch	a139809a97	Updated express dep for windows compatibility.	2012-01-11 07:40:44 -08:00
Guillermo Rauch	8ff2edd79c	Merge pull request #689 from bwillard/master Improve performance of parser.decodePayload	2011-12-16 14:04:12 -08:00
Brian Willard	ebd25676ee	combine two substr calls into one in decodePayload to improve performance	2011-12-16 15:31:48 -06:00
Guillermo Rauch	d9d529cb17	Merge pull request #683 from jherdman/documentation-fix Minor documentation fix	2011-12-12 11:02:24 -08:00
James Herdman	b37666a8e8	Minor documentation fix	2011-12-12 11:10:25 -05:00
Guillermo Rauch	cc2270bb90	Merge pull request #622 from mattrobenolt/master Location mismatch in Safari behind proxy	2011-12-05 14:04:57 -08:00
Matt Robenolt	36fc7b07ea	Minor. Conform to style of other files.	2011-12-05 16:59:15 -05:00
Matt Robenolt	8eab3a87e7	Switching setting to 'match origin protocol'	2011-12-05 16:58:00 -05:00
Guillermo Rauch	94d513c85a	Revert "Fixes leaking Redis subscriptions for #663 . The local flag was not getting passed through onClientDisconnect()." This reverts commit `d5ab46d662`.	2011-11-26 15:14:26 -08:00
Guillermo Rauch	70abe7aada	Revert "Handle leaked dispatch:[id] subscription." This reverts commit `c110036f75`.	2011-11-26 15:14:13 -08:00
Guillermo Rauch	9a8c1c4ae7	Merge pull request #667 from dshaw/patch/redis-disconnect Patch/redis disconnect	2011-11-26 14:03:01 -08:00
Daniel Shaw	c110036f75	Handle leaked dispatch:[id] subscription.	2011-11-26 12:14:39 -08:00
Daniel Shaw	d5ab46d662	Fixes leaking Redis subscriptions for #663 . The local flag was not getting passed through onClientDisconnect().	2011-11-26 11:22:43 -08:00
Guillermo Rauch	eeaca6d9ac	Merge pull request #662 from 3rd-Eden/leak prevent memory leaking on uncompleted requests & add max post size limit...	2011-11-23 14:04:42 -08:00
Arnout Kazemier	a7f45fe6c0	prevent memory leaking on uncompleted requests & add max post size limitation	2011-11-23 22:28:38 +01:00
Guillermo Rauch	b59fd61d56	Merge pull request #661 from 3rd-Eden/travis Fix for testcase	2011-11-22 14:52:36 -08:00
Arnout Kazemier	7948619609	Fix for testcase	2011-11-22 23:49:58 +01:00
Guillermo Rauch	6e8166d039	Merge pull request #660 from 3rd-Eden/travis Assertvarnish	2011-11-22 14:43:21 -08:00
Arnout Kazemier	8fc3e37ca1	Merge branch 'master' of github.com:LearnBoost/socket.io into travis	2011-11-22 23:41:54 +01:00
Guillermo Rauch	17d0f4d489	Merge pull request #630 from gavinuhma/auth-fix set Access-Control-Allow-Origin header to origin to enable withCredentials	2011-11-22 14:38:30 -08:00
Gavin Uhma	61e7e8955a	Merge branch 'master' of git://github.com/LearnBoost/socket.io into auth-fix	2011-11-22 18:03:48 -04:00
Gavin Uhma	4c17f7f83b	Set Access-Control-Allow-Credentials true, regardless of cookie	2011-11-22 18:03:25 -04:00
Arnout Kazemier	0f29d786b2	Remove assertvarnish from package as it breaks on 0.6	2011-11-22 21:18:15 +01:00
Guillermo Rauch	5ee6b43921	Merge pull request #659 from 3rd-Eden/travis Added travis	2011-11-22 11:47:49 -08:00
Arnout Kazemier	f211f78019	Correct irc channel	2011-11-22 20:46:01 +01:00
Arnout Kazemier	eeb2a73f16	Added travis	2011-11-22 20:44:19 +01:00
Guillermo Rauch	3887633e35	Merge pull request #440 from dylang/master Updated package.json to reflect new repo location	2011-11-16 13:05:31 -08:00
Guillermo Rauch	db8cf7673b	Merge pull request #634 from christopherobin/master Fixing issue #432	2011-11-16 13:05:18 -08:00
Guillermo Rauch	dfb852151b	Merge pull request #570 from 3rd-Eden/logger Use tty to detect if we should add colors or not by default.	2011-11-16 13:04:51 -08:00
Guillermo Rauch	7b6c85030e	Merge pull request #643 from einaros/master Bug fixes, and for some reason a heap of whitespace cleanups	2011-11-14 09:09:58 -08:00
einaros	2d5dcc1a8a	whitespace cleanup	2011-11-14 17:57:34 +01:00
einaros	2b28c46400	added proper return after reserved field error	2011-11-14 17:50:57 +01:00
einaros	27714d7286	fixes manager.js failure to close connection after transport error has happened	2011-11-14 17:40:16 +01:00
einaros	ffef944dd5	added implicit port 80 for origin checks. fixes #638	2011-11-14 09:45:44 +01:00
Christophe Robin	f4b434a6a5	Fixed bug #432 in 0.8.7	2011-11-11 11:06:56 +09:00
Gavin Uhma	e4a9342e8b	set Access-Control-Allow-Origin header to origin to enable withCredentials	2011-11-08 18:22:30 -04:00
Guillermo Rauch	3ed6b79781	Release 0.8.7	2011-11-05 13:50:53 -07:00
Matt Robenolt	6f2270add6	Adding configuration variable matchOriginProtocol matchOriginProtocol is meant to be used when running socket.io behind a proxy. matchOriginProtocol should be set to true when you want the location handshake to match the protocol of the origin. This fixes issues with terminating the SSL in front of Node and forcing location to think it's wss instead of ws.	2011-11-03 15:34:24 -04:00
Matt Robenolt	220f8d5bf5	Fixes location mismatch error in Safari.	2011-11-03 01:35:18 -03:00
Guillermo Rauch	946418e70e	Merge pull request #621 from einaros/master Deals with a memleak in namespaces, and silently drops malformed websocket connections	2011-11-02 15:11:21 -07:00
Guillermo Rauch	2bb60ac40b	Merge pull request #616 from thekiur/master This patch will prevent some random memory leaking.	2011-11-02 11:25:19 -07:00
TJ Holowaychuk	e20777d21d	Merge pull request #617 from sutiam/patch-2 add semicolon	2011-11-01 17:33:08 -07:00
sutiam	311ef7e7e7	add semicolon	2011-11-01 17:26:33 -07:00
thekiur	9e92075cbb	Removed useless object: closedA, probably fixed a memory leak	2011-11-01 23:31:58 +02:00
einaros	63043b3d5d	fixes leak #608	2011-10-31 22:47:25 +01:00
einaros	92a3cce272	circumvents #602 .. although only a horribly malformed websocket connection could potentially cause this	2011-10-28 14:04:55 +02:00
Guillermo Rauch	8339c96e84	Merge pull request #596 from einaros/nodenext Node v0.5+ compatibility	2011-10-28 01:30:18 -07:00
einaros	a125fcb1a4	further updates to chat example dependencies	2011-10-28 10:18:47 +02:00
einaros	97f634f18f	further updates to irc example dependencies	2011-10-28 10:18:08 +02:00
einaros	82266cf202	updated stylus dependency in examples to node 0.5+ compatible version	2011-10-28 10:14:26 +02:00
einaros	be94641651	fixed irc example for nodenext	2011-10-28 10:12:52 +02:00
einaros	703d1d778e	fixed chat example for nodenext	2011-10-28 10:10:45 +02:00
einaros	70c61fa84d	Merge remote branch 'upstream/master' into nodenext	2011-10-28 10:10:26 +02:00
Guillermo Rauch	abd0326b06	Release 0.8.6	2011-10-27 20:10:18 +09:00
Guillermo Rauch	3e0b4488f8	Merge pull request #599 from 3rd-Eden/jsonptests The server expects JSON.stringify'd packages	2011-10-27 02:44:50 -07:00
Arnout Kazemier	86908c3b4d	The server expects JSON.stringify'd packages	2011-10-27 09:10:27 +02:00
Guillermo Rauch	5491c2798e	Merge branch 'master' of github.com:LearnBoost/socket.io	2011-10-27 12:54:03 +08:00
Guillermo Rauch	a9def6e209	Merge pull request #598 from 3rd-Eden/utf8 charset=UTF8	2011-10-26 21:53:46 -07:00
Guillermo Rauch	c7a2dc45c8	Merge pull request #591 from einaros/master Resubmission of: Minor potential issues corrected in websocket transports	2011-10-26 21:51:52 -07:00
Guillermo Rauch	cf76b13145	Added JSON decoding on jsonp-polling transport. This is due to browser's buggy handling of outgoing \n	2011-10-27 12:45:19 +08:00
Arnout Kazemier	db2a17f279	charset=UTF8	2011-10-26 11:48:41 +02:00
einaros	3a07cc29bd	added return for clarity	2011-10-26 08:21:22 +02:00
einaros	89a5134b66	corrected whitespace	2011-10-25 23:46:36 +02:00
einaros	6ca42fdc8f	well thats five minutes of my life ill never get back. thanks.	2011-10-25 22:53:37 +02:00
einaros	a9f81a59c2	ensure backwards compatibility	2011-10-25 22:12:55 +02:00
einaros	8a90bf5234	re-enabled flashsocket tests, after bugfixes in flashsocket transport	2011-10-25 21:26:57 +02:00
einaros	357a9cb870	fixed race condition and scoping bug	2011-10-25 21:25:44 +02:00
einaros	8253ed573a	ignore exception on port change	2011-10-25 19:47:39 +02:00
einaros	3f55d82bf7	added node v4 client closing compatibility	2011-10-25 13:30:06 +02:00
einaros	08467d4e12	temporarily disabled flash policy server tests	2011-10-25 13:19:39 +02:00
einaros	cb70f7873f	moved default error handler	2011-10-25 13:18:40 +02:00
einaros	57b0ce73c7	resolve race condition	2011-10-25 13:09:04 +02:00
einaros	25f97431d4	set nodelay	2011-10-25 13:08:49 +02:00
einaros	f931af5758	fixed xhr-polling tests, in a way similar to jsonp	2011-10-25 10:45:20 +02:00
einaros	c88ea9ed61	fixed websocket testing, removed seemingly irrelevant tests	2011-10-25 10:42:18 +02:00
einaros	2bdee1b28f	use new agent	2011-10-25 10:41:58 +02:00
einaros	a1f0b6c361	manager tests now pass properly	2011-10-24 21:26:15 +02:00
einaros	c1e64b90a4	added warning message from default error event handler	2011-10-23 23:03:23 +02:00
einaros	79c3d84a98	circumvent race condition due to changed http bits in 0.5	2011-10-23 14:21:22 +02:00
einaros	f6c376d087	another stab at proper 0.5 agent socket closing	2011-10-23 14:20:21 +02:00
einaros	bc15077ecc	further checks to not close sockets that aren't there	2011-10-23 14:14:48 +02:00
einaros	28bf55e572	patched a few compatibility issues in node-websocket-server	2011-10-23 00:43:07 +02:00
einaros	f213d69e17	check that there's actually a socket to close	2011-10-22 14:39:59 +02:00
einaros	aa6f228ccf	updated to use NODE_PATH rather than old expresso include argument	2011-10-22 14:39:33 +02:00
einaros	553b9e9d68	updated test to work with 0.5	2011-10-22 13:30:30 +02:00
einaros	ec6e43d7ee	updated expresso dep	2011-10-22 13:30:12 +02:00
einaros	48140cf8a0	node 0.5 way of closing agent sockets	2011-10-22 13:29:57 +02:00
einaros	796bc9e95b	capture error emitted by the server, which happens a lot with node 0.5+	2011-10-22 13:28:54 +02:00
einaros	67495ad8a9	case-insensitive match for websocket upgrade, in all websocket transports	2011-10-22 10:21:10 +02:00
einaros	bee1efb11c	fixes #555	2011-10-22 10:16:48 +02:00
Guillermo Rauch	120924f626	Merge pull request #582 from chees/patch-1 Changed sockets.emit to io.sockets.emit to get the example working.	2011-10-16 10:00:20 -07:00
Christiaan	acdbacb25e	Changed sockets.emit to io.sockets.emit to get the example working.	2011-10-16 14:59:14 +03:00
TJ Holowaychuk	cde6a38218	Merge pull request #580 from 3rd-Eden/performance Added a benchmark runner + profile option	2011-10-15 12:12:14 -07:00
Guillermo Rauch	e69c185e17	Merge pull request #581 from dshaw/patch/520 Fixes #520. Updates to latest node_redis.	2011-10-15 11:47:41 -07:00
Daniel Shaw	8cab86af1c	Fixes #520 . Updates to latest node_redis.	2011-10-15 11:43:48 -07:00
Arnout Kazemier	00557f663a	Added error and heartbeat decoding	2011-10-15 15:30:23 +02:00
Arnout Kazemier	54c22aea96	Added a benchmark runner + profile option	2011-10-15 15:10:35 +02:00
Guillermo Rauch	a9929c916f	Merge pull request #578 from 3rd-Eden/performance Use benchmark.js instead, so we can benchmark 0.5.9	2011-10-13 13:42:19 -07:00
Arnout Kazemier	1d66b6b5da	Some tiny optimizations	2011-10-13 22:31:52 +02:00
Arnout Kazemier	a75670c1c2	Use benchmark.js instead, so we can benchmark 0.5.9	2011-10-13 21:00:59 +02:00
Guillermo Rauch	373c729e66	Merge pull request #573 from 3rd-Eden/performance Parser performance boost	2011-10-12 15:10:19 -07:00
Arnout Kazemier	7800003c5e	Returned the switch for the decoder, optimized the switch for the encoder	2011-10-12 22:03:46 +02:00
Arnout Kazemier	b662f2e14e	Optimized the loop, so the most commen packets are checked first	2011-10-12 21:53:38 +02:00
Arnout Kazemier	709c172444	http://cl.ly/402t2C133B2a1P0g1K0h <--- before http://cl.ly/363W080c2j261l3A1m3y <--- after ;o	2011-10-12 21:44:09 +02:00
Tj Holowaychuk	6d5ffa0d33	remove vbench dev dep so people dont need node-canvas	2011-10-11 21:38:31 -07:00
Tj Holowaychuk	f8c7ff2782	Added decode/encode benchmarks	2011-10-11 16:00:15 -07:00
Arnout Kazemier	d9049f69c1	Merge branch 'master' of github.com:LearnBoost/socket.io into logger	2011-10-11 20:01:05 +02:00
Arnout Kazemier	10ffbd59e9	Use tty to detect if we should add colors or not by default.	2011-10-11 20:00:30 +02:00
Guillermo Rauch	175fe8573b	Merge pull request #563 from 3rd-Eden/logger Logger	2011-10-11 08:18:16 -07:00
Guillermo Rauch	0224e4ac5f	Merge pull request #569 from 3rd-Eden/blacklist Blacklist events	2011-10-11 08:13:55 -07:00
Arnout Kazemier	ecd20b0e1f	Added support for blacklisting events that are emitted from the client side. Currently it's possible for a client do .emit('disconnect') and this will trigger the disconnect event on the server.. Which can lead to major issues. We should black list that by default. You can override or add more events by adding them to the `blacklist` setting	2011-10-11 10:40:22 +02:00
Arnout Kazemier	b8f6dc7810	Inital stab at blacklisting client side events	2011-10-11 09:53:26 +02:00
Guillermo Rauch	0339e745fd	Merge pull request #564 from 3rd-Eden/bug/538 fixes #538	2011-10-10 13:23:51 -07:00
Arnout Kazemier	b3740e9ab6	fixes #538	2011-10-10 21:52:16 +02:00
Arnout Kazemier	0b7ed64082	Fixed logging options, closes #540	2011-10-10 21:32:54 +02:00
Arnout Kazemier	07b84f4400	Added a test to ensure that etags do no mess up far future headers	2011-10-10 21:06:58 +02:00
Guillermo Rauch	59e4c3b46c	Merge pull request #562 from 3rd-Eden/static Hardcore caching for pro's	2011-10-10 11:20:38 -07:00
Arnout Kazemier	0e3bbd0e16	Whoops	2011-10-10 20:02:37 +02:00
Arnout Kazemier	763fdd1c4e	Added more hardcore caching fixes #558 Added tests against it Added vary header for gzip	2011-10-10 20:01:28 +02:00
Guillermo Rauch	61bd23f0f9	Merge pull request #561 from einaros/master Proper websocket test fixes, after patching node-websocket-client	2011-10-09 01:33:13 -07:00
Arnout Kazemier	8107c1a1e2	Added support for HEAD requests, closes #557	2011-10-08 15:46:23 +02:00
Arnout Kazemier	fa5b518110	Merge branch 'master' of github.com:LearnBoost/socket.io into static	2011-10-08 15:42:21 +02:00
einaros	b3df2836e9	properly cleaned up async websocket / flashsocket tests, after patching node-websocket-client	2011-10-08 12:02:31 +02:00
einaros	08568ee49e	patched to properly shut down when a finishClose call is made during connection establishment	2011-10-08 12:01:46 +02:00
einaros	aba2d5e0ef	removed empty console.log	2011-10-08 12:00:55 +02:00
Arnout Kazemier	5573f7fcdf	First stab of adding Expires + cache control headers for #558	2011-10-05 20:16:20 +02:00
Dylan Greene	a51fe07420	Updated the package location.	2011-08-01 14:44:11 -03:00