Make these 2 tests work both on 0.4 and 0.6

make it possible to use a regexp to match the socket.io resource URL

History.md

@@ -1,4 +1,35 @@
 
+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
 ==================
 

lib/manager.js

@@ -904,8 +904,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);
 

lib/socket.io.js

@@ -15,7 +15,7 @@ var client = require('socket.io-client');
  * Version.
  */
 
-exports.version = '0.8.7';
+exports.version = '0.9.0';
 
 /**
  * Supported protocol version.

lib/transports/http.js

@@ -72,11 +72,8 @@ HTTPTransport.prototype.handleRequest = function (req) {
 
     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;

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);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "socket.io"
-  , "version": "0.8.7"
+  , "version": "0.9.0"
   , "description": "Real-time apps made cross-browser & easy with a WebSocket-like API"
   , "homepage": "http://socket.io"
   , "keywords": ["websocket", "socket", "realtime", "socket.io", "comet", "ajax"]
@@ -16,7 +16,7 @@
       , "url": "https://github.com/LearnBoost/socket.io.git"
     }
   , "dependencies": {
-        "socket.io-client": "0.8.7"
+        "socket.io-client": "0.9.0"
       , "policyfile": "0.0.4"
       , "redis": "0.6.7"
     }

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')

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')

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;

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');
 

test/static.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('./common')
   , ports = 15400;
 

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;
 

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;

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')

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

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

test/transports.websocket.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('./common')
   , parser = sio.parser
   , ports = 15800;
@@ -131,7 +131,7 @@ module.exports = {
       var url = '/socket.io/' + sio.protocol + '/websocket/' + sid;
       var req = cl.get(url, {headers: headers}, function (res, data) {});
       var closed = false;
-      req.on('close', function() {
+      (req.socket || req).on('close', function() {
         if (closed) return;
         closed = true;
         notConnected.should.be.true;
@@ -169,7 +169,7 @@ module.exports = {
       var url = '/socket.io/' + sio.protocol + '/websocket/' + sid;
       var req = cl.get(url, {headers: headers}, function (res, data) {});
       var closed = false;
-      req.on('close', function() {
+      (req.socket || req).on('close', function() {
         if (closed) return;
         closed = true;
         notConnected.should.be.true;

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
@@ -2652,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');
@@ -2669,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');