Merge remote branch 'gma/master'
This commit is contained in:
commit
d354ea4a8b
|
@ -51,9 +51,9 @@ class Capybara::Server
|
||||||
|
|
||||||
Timeout.timeout(10) do
|
Timeout.timeout(10) do
|
||||||
Thread.new do
|
Thread.new do
|
||||||
if defined?(Rack::Handler::Mongrel)
|
begin
|
||||||
Rack::Handler::Mongrel.run(Identify.new(@app), :Port => port)
|
Rack::Handler::Mongrel.run(Identify.new(@app), :Port => port)
|
||||||
else
|
rescue LoadError
|
||||||
Rack::Handler::WEBrick.run(Identify.new(@app), :Port => port, :AccessLog => [])
|
Rack::Handler::WEBrick.run(Identify.new(@app), :Port => port, :AccessLog => [])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue