Remove servers

lib/rack/handler.rb

@@ -31,7 +31,7 @@ def self.get(server)
     # Select first available Rack handler given an `Array` of server names.
     # Raises `LoadError` if no handler was found.
     #
-    #   > pick ['thin', 'webrick']
+    #   > pick ['puma', 'webrick']
     #   => Rack::Handler::WEBrick
     def self.pick(server_names)
       server_names = Array(server_names)
@@ -45,17 +45,14 @@ def self.pick(server_names)
       raise LoadError, "Couldn't find handler for: #{server_names.join(', ')}."
     end
 
-    SERVER_NAMES = %w(puma thin falcon webrick).freeze
+    RACK_HANDLER = 'RACK_HANDLER'
+
+    SERVER_NAMES = %w(puma falcon webrick).freeze
     private_constant :SERVER_NAMES
 
     def self.default
-      # Guess.
-      if ENV.include?("PHP_FCGI_CHILDREN")
-        Rack::Handler::FastCGI
-      elsif ENV.include?(REQUEST_METHOD)
-        Rack::Handler::CGI
-      elsif ENV.include?("RACK_HANDLER")
-        self.get(ENV["RACK_HANDLER"])
+      if rack_handler = ENV[RACK_HANDLER]
+        self.get(rack_handler)
       else
         pick SERVER_NAMES
       end
@@ -87,18 +84,7 @@ def self.register(server, klass)
       @handlers[server.to_s] = klass.to_s
     end
 
-    autoload :CGI, "rack/handler/cgi"
-    autoload :FastCGI, "rack/handler/fastcgi"
     autoload :WEBrick, "rack/handler/webrick"
-    autoload :LSWS, "rack/handler/lsws"
-    autoload :SCGI, "rack/handler/scgi"
-    autoload :Thin, "rack/handler/thin"
-
-    register 'cgi', 'Rack::Handler::CGI'
-    register 'fastcgi', 'Rack::Handler::FastCGI'
     register 'webrick', 'Rack::Handler::WEBrick'
-    register 'lsws', 'Rack::Handler::LSWS'
-    register 'scgi', 'Rack::Handler::SCGI'
-    register 'thin', 'Rack::Handler::Thin'
   end
 end

lib/rack/handler/cgi.rb

@@ -55,5 +55,7 @@ def self.send_body(body)
         }
       end
     end
+
+    register 'cgi', 'Rack::Handler::CGI'
   end
 end

lib/rack/handler/webrick.rb

@@ -37,7 +37,7 @@ def self.run(app, **options)
 
         @server = ::WEBrick::HTTPServer.new(options)
         @server.mount "/", Rack::Handler::WEBrick, app
-        yield @server  if block_given?
+        yield @server if block_given?
         @server.start
       end
 

test/spec_server.rb

@@ -8,6 +8,8 @@
 require 'net/http'
 require 'net/https'
 
+require 'rack/handler/cgi'
+
 module Minitest::Spec::DSL
   alias :should :it
 end
@@ -75,17 +77,6 @@ def with_stderr
     server.middleware['deployment'].flatten.must_include Rack::TempfileReaper
   end
 
-  it "support CGI" do
-    begin
-      o, ENV["REQUEST_METHOD"] = ENV["REQUEST_METHOD"], 'foo'
-      server = Rack::Server.new(app: 'foo')
-      server.server.name =~ /CGI/
-      Rack::Server.logging_middleware.call(server).must_be_nil
-    ensure
-      ENV['REQUEST_METHOD'] = o
-    end
-  end
-
   it "be quiet if said so" do
     server = Rack::Server.new(app: "FOO", quiet: true)
     Rack::Server.logging_middleware.call(server).must_be_nil