@@ -117,23 +117,10 @@ module Sinatra alias :build_application :application def server - @server ||= case options.server - when "mongrel" - Rack::Handler::Mongrel - when "webrick" - Rack::Handler::WEBrick - when "cgi" - Rack::Handler::CGI - when "fastcgi" - Rack::Handler::FastCGI - else - if defined?(Rack::Handler::Thin) - Rack::Handler::Thin - else - options.server ||= "mongrel" - eval("Rack::Handler::#{options.server.capitalize}") - end - end + options.server ||= defined?(Rack::Handler::Thin) ? "thin" : "mongrel" + # Convert the server into the actual handler name + handler = options.server.capitalize.sub(/cgi$/, 'CGI') + @server ||= eval("Rack::Handler::#{handler}") end def run lib/sinatra.rb bcdf496da28b048ad2229285f73da6b8dc410caa 7526dacf33d4411d7f0e98bceeadc91b46dc56bb bmizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/07f254733192d114d59143b997ee51a4ca003a48 07f254733192d114d59143b997ee51a4ca003a48 2008-05-20T15:11:47-07:00 2008-05-20T15:11:47-07:00 Merge branch 'master' of git://github.com/cypher/sinatra into cypher/master c3ab771020e47c5d0165257e66ffc60148380ba7 bmizerany blake.mizerany@gmail.com