puma 3.6.2 → 3.7.0

data/lib/puma/compat.rb

@@ -6,13 +6,9 @@ class String
   end
 
   unless method_defined? :byteslice
-    if RUBY_VERSION < '1.9'
-      alias_method :byteslice, :[]
-    else
-      def byteslice(*arg)
-        enc = self.encoding
-        self.dup.force_encoding(Encoding::ASCII_8BIT).slice(*arg).force_encoding(enc)
-      end
+    def byteslice(*arg)
+      enc = self.encoding
+      self.dup.force_encoding(Encoding::ASCII_8BIT).slice(*arg).force_encoding(enc)
     end
   end
 end

data/lib/puma/configuration.rb

@@ -1,5 +1,6 @@
 require 'puma/rack/builder'
 require 'puma/plugin'
+require 'puma/const'
 
 module Puma
 
@@ -30,7 +31,7 @@ module Puma
     end
 
     def [](key)
-      @set.each do |o|
+      @set.reverse_each do |o|
         if o.key? key
           return o[key]
         end
@@ -251,6 +252,7 @@ module Puma
       end
 
       if @options[:log_requests]
+        require 'puma/commonlogger'
         logger = @options[:logger]
         found = CommonLogger.new(found, logger)
       end

data/lib/puma/const.rb

@@ -73,19 +73,14 @@ module Puma
     511 => 'Network Authentication Required'
   }
 
-  SYMBOL_TO_STATUS_CODE = Hash[*HTTP_STATUS_CODES.map { |code, message|
-    [message.downcase.gsub(/\s|-|'/, '_').to_sym, code]
-  }.flatten]
-
   # For some HTTP status codes the client only expects headers.
   #
 
-  no_body = {}
-  ((100..199).to_a << 204 << 205 << 304).each do |code|
-    no_body[code] = true
-  end
-
-  STATUS_WITH_NO_ENTITY_BODY = no_body
+  STATUS_WITH_NO_ENTITY_BODY = {
+    204 => true,
+    205 => true,
+    304 => true
+  }
 
   # Frequently used constants when constructing requests or responses.  Many times
   # the constant just refers to a string with the same contents.  Using these constants
@@ -100,8 +95,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.6.2".freeze
-    CODE_NAME = "Sleepy Sunday Serenity".freeze
+    PUMA_VERSION = VERSION = "3.7.0".freeze
+    CODE_NAME = "Snowy Sagebrush".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
@@ -118,15 +113,6 @@ module Puma
     # sending data back
     WRITE_TIMEOUT = 10
 
-    # How long, after raising the ForceShutdown of a thread during
-    # forced shutdown mode, to wait for the thread to try and finish
-    # up it's work before leaving the thread to die on the vine.
-    SHUTDOWN_GRACE_TIME = 5 # seconds
-
-    DATE = "Date".freeze
-
-    SCRIPT_NAME = "SCRIPT_NAME".freeze
-
     # The original URI requested by the client.
     REQUEST_URI= 'REQUEST_URI'.freeze
     REQUEST_PATH = 'REQUEST_PATH'.freeze
@@ -163,26 +149,12 @@ module Puma
     # Maximum request body size before it is moved out of memory and into a tempfile for reading.
     MAX_BODY = MAX_HEADER
 
-    # A frozen format for this is about 15% faster
-    STATUS_FORMAT = "HTTP/1.1 %d %s\r\nConnection: close\r\n".freeze
-
-    CONTENT_TYPE = "Content-Type".freeze
-
-    LAST_MODIFIED = "Last-Modified".freeze
-    ETAG = "ETag".freeze
-    SLASH = "/".freeze
     REQUEST_METHOD = "REQUEST_METHOD".freeze
-    GET = "GET".freeze
     HEAD = "HEAD".freeze
     # ETag is based on the apache standard of hex mtime-size-inode (inode is 0 on win32)
-    ETAG_FORMAT = "\"%x-%x-%x\"".freeze
     LINE_END = "\r\n".freeze
     REMOTE_ADDR = "REMOTE_ADDR".freeze
     HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR".freeze
-    HTTP_IF_MODIFIED_SINCE = "HTTP_IF_MODIFIED_SINCE".freeze
-    HTTP_IF_NONE_MATCH = "HTTP_IF_NONE_MATCH".freeze
-    REDIRECT = "HTTP/1.1 302 Found\r\nLocation: %s\r\nConnection: close\r\n\r\n".freeze
-    HOST = "HOST".freeze
 
     SERVER_NAME = "SERVER_NAME".freeze
     SERVER_PORT = "SERVER_PORT".freeze
@@ -195,7 +167,6 @@ module Puma
 
     SERVER_PROTOCOL = "SERVER_PROTOCOL".freeze
     HTTP_11 = "HTTP/1.1".freeze
-    HTTP_10 = "HTTP/1.0".freeze
 
     SERVER_SOFTWARE = "SERVER_SOFTWARE".freeze
     GATEWAY_INTERFACE = "GATEWAY_INTERFACE".freeze

data/lib/puma/control_cli.rb

@@ -1,5 +1,5 @@
 require 'optparse'
-require 'puma'
+require 'puma/state_file'
 require 'puma/const'
 require 'puma/detect'
 require 'puma/configuration'
@@ -179,39 +179,39 @@ module Puma
       end
 
       begin
-        Process.getpgid @pid
-      rescue SystemCallError
-        if @command == "restart"
-          start
-        else
-          raise "No pid '#{@pid}' found"
-        end
-      end
 
-      case @command
-      when "restart"
-        Process.kill "SIGUSR2", @pid
+        case @command
+        when "restart"
+          Process.kill "SIGUSR2", @pid
 
-      when "halt"
-        Process.kill "QUIT", @pid
+        when "halt"
+          Process.kill "QUIT", @pid
 
-      when "stop"
-        Process.kill "SIGTERM", @pid
+        when "stop"
+          Process.kill "SIGTERM", @pid
 
-      when "stats"
-        puts "Stats not available via pid only"
-        return
+        when "stats"
+          puts "Stats not available via pid only"
+          return
 
-      when "reload-worker-directory"
-        puts "reload-worker-directory not available via pid only"
-        return
+        when "reload-worker-directory"
+          puts "reload-worker-directory not available via pid only"
+          return
 
-      when "phased-restart"
-        Process.kill "SIGUSR1", @pid
+        when "phased-restart"
+          Process.kill "SIGUSR1", @pid
 
-      else
-        message "Puma is started"
-        return
+        else
+          message "Puma is started"
+          return
+        end
+
+      rescue SystemCallError
+        if @command == "restart"
+          start
+        else
+          raise "No pid '#{@pid}' found"
+        end
       end
 
       message "Command #{@command} sent success"

data/lib/puma/detect.rb

@@ -5,7 +5,9 @@ module Puma
     IS_JRUBY
   end
 
+  IS_WINDOWS = RUBY_PLATFORM =~ /mswin|ming|cygwin/
+
   def self.windows?
-    RUBY_PLATFORM =~ /mswin|ming|cygwin/
+    IS_WINDOWS
   end
 end

data/lib/puma/events.rb

@@ -1,4 +1,5 @@
 require 'puma/const'
+require "puma/null_io"
 require 'stringio'
 
 module Puma
@@ -34,8 +35,6 @@ module Puma
 
       @debug = ENV.key? 'PUMA_DEBUG'
 
-      @on_booted = []
-
       @hooks = Hash.new { |h,k| h[k] = [] }
     end
 
@@ -48,7 +47,7 @@ module Puma
       @hooks[hook].each { |t| t.call(*args) }
     end
 
-    # Register a callbock for a given hook
+    # Register a callback for a given hook
     #
     def register(hook, obj=nil, &blk)
       if obj and blk
@@ -124,12 +123,12 @@ module Puma
       end
     end
 
-    def on_booted(&b)
-      @on_booted << b
+    def on_booted(&block)
+      register(:on_booted, &block)
     end
 
     def fire_on_booted!
-      @on_booted.each { |b| b.call }
+      fire(:on_booted)
     end
 
     DEFAULT = new(STDOUT, STDERR)

data/lib/puma/io_buffer.rb

@@ -1,6 +1,6 @@
 require 'puma/detect'
 
-if Puma::IS_JRUBY
+if Puma.jruby?
   require 'puma/java_io_buffer'
 else
   require 'puma/puma_http11'

data/lib/puma/launcher.rb

@@ -1,15 +1,12 @@
-require 'puma/server'
-require 'puma/const'
-require 'puma/configuration'
-require 'puma/binder'
+require 'puma/events'
 require 'puma/detect'
-require 'puma/daemon_ext'
-require 'puma/util'
-require 'puma/single'
+
 require 'puma/cluster'
-require 'puma/state_file'
+require 'puma/single'
 
-require 'puma/commonlogger'
+require 'puma/const'
+
+require 'puma/binder'
 
 module Puma
   # Puma::Launcher is the single entry point for starting a Puma server based on user
@@ -107,6 +104,8 @@ module Puma
       path = @options[:state]
       return unless path
 
+      require 'puma/state_file'
+
       sf = StateFile.new
       sf.pid = Process.pid
       sf.control_url = @options[:control_url]
@@ -256,6 +255,8 @@ module Puma
         ENV['PUMA_BUNDLER_PRUNED'] = '1'
         wild = File.expand_path(File.join(puma_lib_dir, "../bin/puma-wild"))
         args = [Gem.ruby, wild, '-I', dirs.join(':'), deps.join(',')] + @original_argv
+        # Ruby 2.0+ defaults to true which breaks socket activation
+        args += [{:close_others => false}] if RUBY_VERSION >= '2.0'
         Kernel.exec(*args)
       end
     end

data/lib/puma/null_io.rb

@@ -1,42 +1,35 @@
 module Puma
-
   # Provides an IO-like object that always appears to contain no data.
   # Used as the value for rack.input when the request has no body.
   #
   class NullIO
-    # Always returns nil
-    #
     def gets
       nil
     end
 
-    # Never yields
-    #
     def each
     end
 
-    # Mimics IO#read with no data
+    # Mimics IO#read with no data.
     #
-    def read(count=nil,buffer=nil)
+    def read(count = nil, _buffer = nil)
       (count && count > 0) ? nil : ""
     end
 
-    # Does nothing
-    #
     def rewind
     end
 
-    # Does nothing
-    #
     def close
     end
 
-    # Always zero
-    #
     def size
       0
     end
 
+    def eof?
+      true
+    end
+
     def sync=(v)
     end
 

data/lib/puma/rack/builder.rb

@@ -1,3 +1,6 @@
+module Puma
+end
+
 module Puma::Rack
   class Options
     def parse!(args)

data/lib/puma/rack/urlmap.rb

@@ -43,15 +43,17 @@ module Puma::Rack
     def call(env)
       path = env['PATH_INFO']
       script_name = env['SCRIPT_NAME']
-      hHost = env['HTTP_HOST']
-      sName = env['SERVER_NAME']
-      sPort = env['SERVER_PORT']
+      http_host = env['HTTP_HOST']
+      server_name = env['SERVER_NAME']
+      server_port = env['SERVER_PORT']
+
+      is_same_server = casecmp?(http_host, server_name) ||
+                    casecmp?(http_host, "#{server_name}:#{server_port}")
 
       @mapping.each do |host, location, match, app|
-        unless casecmp?(hHost, host) \
-            || casecmp?(sName, host) \
-            || (!host && (casecmp?(hHost, sName) ||
-                          casecmp?(hHost, sName+':'+sPort)))
+        unless casecmp?(http_host, host) \
+            || casecmp?(server_name, host) \
+            || (!host && is_same_server)
           next
         end
 
@@ -87,4 +89,3 @@ module Puma::Rack
     end
   end
 end
-

data/lib/puma/runner.rb

@@ -1,3 +1,6 @@
+require 'puma/server'
+require 'puma/const'
+
 module Puma
   class Runner
     def initialize(cli, events)
@@ -104,12 +107,20 @@ module Puma
       append = @options[:redirect_append]
 
       if stdout
+        unless Dir.exists?(File.dirname(stdout))
+          raise "Cannot redirect STDOUT to #{stdout}"
+        end
+
         STDOUT.reopen stdout, (append ? "a" : "w")
         STDOUT.sync = true
         STDOUT.puts "=== puma startup: #{Time.now} ==="
       end
 
       if stderr
+        unless Dir.exists?(File.dirname(stderr))
+          raise "Cannot redirect STDERR to #{stderr}"
+        end
+
         STDERR.reopen stderr, (append ? "a" : "w")
         STDERR.sync = true
         STDERR.puts "=== puma startup: #{Time.now} ==="

data/lib/puma/single.rb

@@ -1,4 +1,6 @@
 require 'puma/runner'
+require 'puma/detect'
+require 'puma/plugin'
 
 module Puma
   class Single < Runner

data/lib/puma/thread_pool.rb

@@ -4,10 +4,14 @@ module Puma
   # A simple thread pool management object.
   #
   class ThreadPool
-
     class ForceShutdown < RuntimeError
     end
 
+    # How long, after raising the ForceShutdown of a thread during
+    # forced shutdown mode, to wait for the thread to try and finish
+    # up its work before leaving the thread to die on the vine.
+    SHUTDOWN_GRACE_TIME = 5 # seconds
+
     # Maintain a minimum of +min+ and maximum of +max+ threads
     # in the pool.
     #
@@ -181,7 +185,9 @@ module Puma
           @spawned -= 1
         end
 
-        @workers -= dead_workers
+        @workers.delete_if do |w|
+          dead_workers.include?(w)
+        end
       end
     end
 
@@ -257,18 +263,12 @@ module Puma
         @workers.dup
       end
 
-      case timeout
-      when -1
+      if timeout == -1
+        # Wait for threads to finish without force shutdown.
         threads.each(&:join)
-      when 0
-        threads.each do |t|
-          t.raise ForceShutdown
-        end
-
-        threads.each do |t|
-          t.join Const::SHUTDOWN_GRACE_TIME
-        end
       else
+        # Wait for threads to finish after n attempts (+timeout+).
+        # If threads are still running, it will forcefully kill them.
         timeout.times do
           threads.delete_if do |t|
             t.join 1
@@ -286,7 +286,7 @@ module Puma
         end
 
         threads.each do |t|
-          t.join Const::SHUTDOWN_GRACE_TIME
+          t.join SHUTDOWN_GRACE_TIME
         end
       end