7 files changed, 8 insertions, 8 deletions
diff --git a/lib/rack/handler/cgi.rb b/lib/rack/handler/cgi.rb
index a223c545..fd7764c7 100644
--- a/lib/rack/handler/cgi.rb
+++ b/lib/rack/handler/cgi.rb
@@ -6,7 +6,7 @@ require 'rack/rewindable_input'
 module Rack
   module Handler
     class CGI
-      def self.run(app, options = nil)
+      def self.run(app, **options)
         $stdin.binmode
         serve app
       end
diff --git a/lib/rack/handler/fastcgi.rb b/lib/rack/handler/fastcgi.rb
index b3f825da..90ea6278 100644
--- a/lib/rack/handler/fastcgi.rb
+++ b/lib/rack/handler/fastcgi.rb
@@ -20,7 +20,7 @@ end
 module Rack
   module Handler
     class FastCGI
-      def self.run(app, options = {})
+      def self.run(app, **options)
         if options[:File]
           STDIN.reopen(UNIXServer.new(options[:File]))
         elsif options[:Port]
diff --git a/lib/rack/handler/lsws.rb b/lib/rack/handler/lsws.rb
index 803182a2..94a2337a 100644
--- a/lib/rack/handler/lsws.rb
+++ b/lib/rack/handler/lsws.rb
@@ -7,7 +7,7 @@ require 'rack/rewindable_input'
 module Rack
   module Handler
     class LSWS
-      def self.run(app, options = nil)
+      def self.run(app, **options)
         while LSAPI.accept != nil
           serve app
         end
diff --git a/lib/rack/handler/scgi.rb b/lib/rack/handler/scgi.rb
index c8e91606..f0aa184e 100644
--- a/lib/rack/handler/scgi.rb
+++ b/lib/rack/handler/scgi.rb
@@ -10,7 +10,7 @@ module Rack
     class SCGI < ::SCGI::Processor
       attr_accessor :app
 
-      def self.run(app, options = nil)
+      def self.run(app, **options)
         options[:Socket] = UNIXServer.new(options[:File]) if options[:File]
         new(options.merge(app: app,
                           host: options[:Host],
diff --git a/lib/rack/handler/thin.rb b/lib/rack/handler/thin.rb
index 712ab0a9..7378e325 100644
--- a/lib/rack/handler/thin.rb
+++ b/lib/rack/handler/thin.rb
@@ -10,7 +10,7 @@ require "rack/chunked"
 module Rack
   module Handler
     class Thin
-      def self.run(app, options = {})
+      def self.run(app, **options)
         environment  = ENV['RACK_ENV'] || 'development'
         default_host = environment == 'development' ? 'localhost' : '0.0.0.0'
 
diff --git a/lib/rack/handler/webrick.rb b/lib/rack/handler/webrick.rb
index 7ec5ecc6..fa792283 100644
--- a/lib/rack/handler/webrick.rb
+++ b/lib/rack/handler/webrick.rb
@@ -24,7 +24,7 @@ end
 module Rack
   module Handler
     class WEBrick < ::WEBrick::HTTPServlet::AbstractServlet
-      def self.run(app, options = {})
+      def self.run(app, **options)
         environment  = ENV['RACK_ENV'] || 'development'
         default_host = environment == 'development' ? 'localhost' : nil
 
diff --git a/lib/rack/server.rb b/lib/rack/server.rb
index 6137f043..491a81f2 100644
--- a/lib/rack/server.rb
+++ b/lib/rack/server.rb
@@ -285,7 +285,7 @@ module Rack
       self.class.middleware
     end
 
-    def start &blk
+    def start(&block)
       if options[:warn]
         $-w = true
       end
@@ -326,7 +326,7 @@ module Rack
         end
       end
 
-      server.run wrapped_app, options, &blk
+      server.run(wrapped_app, **options, &block)
     end
 
     def server