1
0
Fork 0
mirror of https://github.com/teamcapybara/capybara.git synced 2022-11-09 12:08:07 -05:00

Merge remote branch 'gma/master'

This commit is contained in:
Jonas Nicklas 2010-01-23 12:42:27 +01:00
commit d354ea4a8b

View file

@ -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