0
@@ -103,8 +103,7 @@ else
0
   inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
0
 end
0
 
0
-case server
0
-when nil
0
+unless server = Rack::Handler.get(server)
0
   # Guess.
0
   if ENV.include?("PHP_FCGI_CHILDREN")
0
     server = Rack::Handler::FastCGI
0
@@ -121,18 +120,6 @@ when nil
0
       server = Rack::Handler::WEBrick
0
     end
0
   end
0
-when "mongrel"
0
-  server = Rack::Handler::Mongrel
0
-when "evented_mongrel"
0
-  server = Rack::Handler::EventedMongrel
0
-when "webrick"
0
-  server = Rack::Handler::WEBrick
0
-when "cgi"
0
-  server = Rack::Handler::CGI
0
-when "fastcgi"
0
-  server = Rack::Handler::FastCGI
0
-else
0
-  server = Rack::Handler.const_get(server.capitalize)
0
 end
0
 
0
 p server  if $DEBUG

0
@@ -26,6 +26,7 @@ module Rack
0
   autoload :CommonLogger, "rack/commonlogger"
0
   autoload :File, "rack/file"
0
   autoload :ForwardRequest, "rack/recursive"
0
+  autoload :Handler, "rack/handler"
0
   autoload :Lint, "rack/lint"
0
   autoload :Recursive, "rack/recursive"
0
   autoload :Reloader, "rack/reloader"
0
@@ -70,23 +71,4 @@ module Rack
0
   module Adapter
0
     autoload :Camping, "rack/adapter/camping"
0
   end
0
-
0
-  # *Handlers* connect web servers with Rack.
0
-  #
0
-  # Rack includes Handlers for Mongrel, WEBrick, FastCGI, CGI, SCGI
0
-  # and LiteSpeed.
0
-  #
0
-  # Handlers usually are activated by calling <tt>MyHandler.run(myapp)</tt>.
0
-  # A second optional hash can be passed to include server-specific
0
-  # configuration.
0
-
0
-  module Handler
0
-    autoload :CGI, "rack/handler/cgi"
0
-    autoload :FastCGI, "rack/handler/fastcgi"
0
-    autoload :Mongrel, "rack/handler/mongrel"
0
-    autoload :EventedMongrel, "rack/handler/evented_mongrel"
0
-    autoload :WEBrick, "rack/handler/webrick"
0
-    autoload :LSWS, "rack/handler/lsws"
0
-    autoload :SCGI, "rack/handler/scgi"
0
-  end
0
 end