@@ -118,8 +118,14 @@ module Sinatra def server options.server ||= defined?(Rack::Handler::Thin) ? "thin" : "mongrel" + # Convert the server into the actual handler name - handler = options.server.capitalize.sub(/cgi$/, 'CGI') + handler = options.server.capitalize + + # If the convenience conversion didn't get us anything, + # fall back to what the user actually set. + handler = options.server unless Rack::Handler.const_defined?(handler) + @server ||= eval("Rack::Handler::#{handler}") end lib/sinatra.rb ea3239c88f8a85f82cc891589bc6ad1c339719e8 Chris Schneider chris@christopher-schneider.com http://github.com/cschneid/sinatra/commit/b404b0a78e26bb9ccddfe655ba45072e97c6db7d b404b0a78e26bb9ccddfe655ba45072e97c6db7d 2008-06-07T22:24:32-07:00 2008-06-07T22:18:07-07:00 Small tweak to server method to fall back on exactly what the user sets via 'set :server, handler' if Rack::Handler::Thing doesn't exist. This lets special capitalziation cases like FastCGI, CGI, and WEBrick be handled easily. 4355a98512fdeb5eb4b5421ba9c574e99b70992a Chris Schneider chris@christopher-schneider.com