Darrin Holst to contributors

README.rdoc

@@ -377,6 +377,7 @@ The following people have dedicated their time and effort to Capybara:
 * Pavel Gabriel
 * Bodaniel Jeanes
 * Carl Porth
+* Darrin Holst
 
 == License:
 

lib/capybara/server.rb

@@ -59,16 +59,18 @@ class Capybara::Server
     Capybara.log "application has already booted" and return self if responsive?
     Capybara.log "booting Rack applicartion on port #{port}"
 
-    Timeout.timeout(10) do
+    Thread.new do
-      Thread.new do
+      handler.run(Identify.new(@app), :Port => port, :AccessLog => [])
-        handler.run(Identify.new(@app), :Port => port, :AccessLog => [])
+    end
-      end
+    Capybara.log "checking if application has booted"
-      Capybara.log "checking if application has booted"
 
-      loop do
+    Capybara::WaitUntil.timeout(10) do
-        Capybara.log("application has booted") and break if responsive?
+      if responsive?
-        Capybara.log("waiting for application to boot...")
+        Capybara.log("application has booted")
+        true
+      else
         sleep 0.5
+        false
       end
     end
     self