summary refs log tree commit
diff options
context:
space:
mode:
authorJames Tucker <jftucker@gmail.com>2016-03-12 20:19:23 -0800
committerJames Tucker <jftucker@gmail.com>2016-03-12 20:19:23 -0800
commit95172a60fe5c2a3850163fc75e0981fe440c064e (patch)
treef55d5a7c9553a6f320eb2235d00f3ff16cd36705
parent09084fd2db976d74bfbcb5779a7c131d1943f3e2 (diff)
parent4208c283aa7dafc67a2ec4229f822e9be8ea3694 (diff)
downloadrack-95172a60fe5c2a3850163fc75e0981fe440c064e.tar.gz
Merge pull request #1027 from rack/default-server
Puma should be the default webserver for rackup
-rw-r--r--lib/rack/handler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rack/handler.rb b/lib/rack/handler.rb
index adaac5d6..70a77fa9 100644
--- a/lib/rack/handler.rb
+++ b/lib/rack/handler.rb
@@ -52,7 +52,7 @@ module Rack
       elsif ENV.include?("RACK_HANDLER")
         self.get(ENV["RACK_HANDLER"])
       else
-        pick ['thin', 'puma', 'webrick']
+        pick ['puma', 'thin', 'webrick']
       end
     end