A few hacks to enable testing using CometD stress testing tools.

faye · Apr 3, 2010 · 929c33f · 929c33f
1 parent 0fa86cf
commit 929c33f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/build/faye.js b/build/faye.js
@@ -1025,7 +1025,7 @@ Faye.Server = Faye.Class({
     if (!message.version)
       response.error = Faye.Error.parameterMissing('version');
 
-    var clientConns = message.supportedConnectionTypes,
+    var clientConns = message.supportedConnectionTypes || ['long-polling'],
         commonConns;
 
     if (!local) {

diff --git a/examples/node/app.js b/examples/node/app.js
@@ -5,7 +5,7 @@ var fs    = require('fs'),
     faye  = require('./faye');
 
 var PUBLIC_DIR = path.dirname(__filename) + '/../shared/public',
-    comet      = new faye.NodeAdapter({mount: '/comet', timeout: 45}),
+    comet      = new faye.NodeAdapter({mount: '/cometd', timeout: 5}),
 
     port       = process.ARGV[2] || '8000';
 

diff --git a/examples/rack/config.ru b/examples/rack/config.ru
@@ -3,6 +3,6 @@ dir = File.dirname(__FILE__)
 require dir + '/../../lib/faye'
 require dir + '/app'
 
-use Faye::RackAdapter, :mount => '/comet', :timeout => 25
+use Faye::RackAdapter, :mount => '/cometd', :timeout => 5
 run Sinatra::Application
 
diff --git a/javascript/server.js b/javascript/server.js
@@ -112,7 +112,7 @@ Faye.Server = Faye.Class({
     if (!message.version)
       response.error = Faye.Error.parameterMissing('version');
 
-    var clientConns = message.supportedConnectionTypes,
+    var clientConns = message.supportedConnectionTypes || ['long-polling'],
         commonConns;
 
     if (!local) {

diff --git a/lib/faye/server.rb b/lib/faye/server.rb
@@ -104,7 +104,7 @@ def handshake(message, local = false)
       unless local
         response['supportedConnectionTypes'] = CONNECTION_TYPES
 
-        client_conns = message['supportedConnectionTypes']
+        client_conns = message['supportedConnectionTypes'] || ['long-polling']
         if client_conns
           common_conns = client_conns.select { |c| CONNECTION_TYPES.include?(c) }
           response['error'] = Error.conntype_mismatch(*client_conns) if common_conns.empty?