Merge remote branch 'gma/master'

2010-01-23 12:42:27 +01:00 · 2010-01-23 12:42:27 +01:00 · d354ea4a8b
parent 2d43f26b59 c50d9c8490
commit d354ea4a8b
1 changed files with 2 additions and 2 deletions
--- a/lib/capybara/server.rb
+++ b/lib/capybara/server.rb
@ -51,9 +51,9 @@ class Capybara::Server

    Timeout.timeout(10) do
      Thread.new do
-        if defined?(Rack::Handler::Mongrel)
+        begin
          Rack::Handler::Mongrel.run(Identify.new(@app), :Port => port)
-        else
+        rescue LoadError
          Rack::Handler::WEBrick.run(Identify.new(@app), :Port => port, :AccessLog => [])
        end
      end