lib/rack/handler.rb test/spec_rack_handler.rb @@ -103,8 +103,7 @@ else inner_app = Object.const_get(File.basename(config, '.rb').capitalize) end -case server -when nil +unless server = Rack::Handler.get(server) # Guess. if ENV.include?("PHP_FCGI_CHILDREN") server = Rack::Handler::FastCGI @@ -121,18 +120,6 @@ when nil server = Rack::Handler::WEBrick end end -when "mongrel" - server = Rack::Handler::Mongrel -when "evented_mongrel" - server = Rack::Handler::EventedMongrel -when "webrick" - server = Rack::Handler::WEBrick -when "cgi" - server = Rack::Handler::CGI -when "fastcgi" - server = Rack::Handler::FastCGI -else - server = Rack::Handler.const_get(server.capitalize) end p server if $DEBUG bin/rackup @@ -26,6 +26,7 @@ module Rack autoload :CommonLogger, "rack/commonlogger" autoload :File, "rack/file" autoload :ForwardRequest, "rack/recursive" + autoload :Handler, "rack/handler" autoload :Lint, "rack/lint" autoload :Recursive, "rack/recursive" autoload :Reloader, "rack/reloader" @@ -70,23 +71,4 @@ module Rack module Adapter autoload :Camping, "rack/adapter/camping" end - - # *Handlers* connect web servers with Rack. - # - # Rack includes Handlers for Mongrel, WEBrick, FastCGI, CGI, SCGI - # and LiteSpeed. - # - # Handlers usually are activated by calling <tt>MyHandler.run(myapp)</tt>. - # A second optional hash can be passed to include server-specific - # configuration. - - module Handler - autoload :CGI, "rack/handler/cgi" - autoload :FastCGI, "rack/handler/fastcgi" - autoload :Mongrel, "rack/handler/mongrel" - autoload :EventedMongrel, "rack/handler/evented_mongrel" - autoload :WEBrick, "rack/handler/webrick" - autoload :LSWS, "rack/handler/lsws" - autoload :SCGI, "rack/handler/scgi" - end end lib/rack.rb aa2d5501e5f65820c5480552289d8d52ab0ba31e Christian Neukirchen chneukirchen@gmail.com http://github.com/chneukirchen/rack-mirror/commit/ed86dfd676dcb46e276b6906f017df514e5632f9 ed86dfd676dcb46e276b6906f017df514e5632f9 2008-05-24T08:54:00-07:00 2008-05-24T08:54:00-07:00 Allow handlers to register themselves with Rack::Handler. darcs-hash:20080524155410-4fc50-e851f342c8bd7461dfb40c30575fec73d0fe380e.gz 0942c84f57f557d899fa767e06ca37a196563185 Christian Neukirchen chneukirchen@gmail.com