lib/faye-rails/middleware.rb in faye-rails-2.0.0 vs lib/faye-rails/middleware.rb in faye-rails-2.0.1

@@ -39,10 +39,11 @@
       elsif unknown_options.any?
         raise ArgumentError, "Unknown options: #{unknown_options * ", "}."
       end
 
       options = DEFAULTS.merge(options)
-      Faye::WebSocket.load_adapter(options.delete(:server))
+      server = options.delete(:server)
+      Faye::WebSocket.load_adapter(server) if server && server != 'passenger'
 
       @adapter = FayeRails::RackAdapter.new(@app, options)
       @adapter.instance_eval(&block) if block.respond_to? :call
     end