puma 2.16.0 → 3.11.4

data/lib/puma/plugin.rb

@@ -0,0 +1,115 @@
+module Puma
+  class UnknownPlugin < RuntimeError; end
+
+  class PluginLoader
+    def initialize
+      @instances = []
+    end
+
+    def create(name)
+      if cls = Plugins.find(name)
+        plugin = cls.new(Plugin)
+        @instances << plugin
+        return plugin
+      end
+
+      raise UnknownPlugin, "File failed to register properly named plugin"
+    end
+
+    def fire_starts(launcher)
+      @instances.each do |i|
+        if i.respond_to? :start
+          i.start(launcher)
+        end
+      end
+    end
+  end
+
+  class PluginRegistry
+    def initialize
+      @plugins = {}
+      @background = []
+    end
+
+    def register(name, cls)
+      @plugins[name] = cls
+    end
+
+    def find(name)
+      name = name.to_s
+
+      if cls = @plugins[name]
+        return cls
+      end
+
+      begin
+        require "puma/plugin/#{name}"
+      rescue LoadError
+        raise UnknownPlugin, "Unable to find plugin: #{name}"
+      end
+
+      if cls = @plugins[name]
+        return cls
+      end
+
+      raise UnknownPlugin, "file failed to register a plugin"
+    end
+
+    def add_background(blk)
+      @background << blk
+    end
+
+    def fire_background
+      @background.each do |b|
+        Thread.new(&b)
+      end
+    end
+  end
+
+  Plugins = PluginRegistry.new
+
+  class Plugin
+    # Matches
+    #  "C:/Ruby22/lib/ruby/gems/2.2.0/gems/puma-3.0.1/lib/puma/plugin/tmp_restart.rb:3:in `<top (required)>'"
+    #  AS
+    #  C:/Ruby22/lib/ruby/gems/2.2.0/gems/puma-3.0.1/lib/puma/plugin/tmp_restart.rb
+    CALLER_FILE = /
+      \A       # start of string
+      .+       # file path (one or more characters)
+      (?=      # stop previous match when
+        :\d+     # a colon is followed by one or more digits
+        :in      # followed by a colon followed by in
+      )
+    /x
+
+    def self.extract_name(ary)
+      path = ary.first[CALLER_FILE]
+
+      m = %r!puma/plugin/([^/]*)\.rb$!.match(path)
+      return m[1]
+    end
+
+    def self.create(&blk)
+      name = extract_name(caller)
+
+      cls = Class.new(self)
+
+      cls.class_eval(&blk)
+
+      Plugins.register name, cls
+    end
+
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def in_background(&blk)
+      Plugins.add_background blk
+    end
+
+    def workers_supported?
+      return false if Puma.jruby? || Puma.windows?
+      true
+    end
+  end
+end

data/lib/puma/rack/backports/uri/common_193.rb

@@ -8,22 +8,26 @@ require 'uri/common'
 # Relevant commit:
 # https://github.com/ruby/ruby/commit/edb7cdf1eabaff78dfa5ffedfbc2e91b29fa9ca1
 
+
 module URI
-  256.times do |i|
-    TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
-  end
-  TBLENCWWWCOMP_[' '] = '+'
-  TBLENCWWWCOMP_.freeze
+  begin
+    256.times do |i|
+      TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
+    end
+    TBLENCWWWCOMP_[' '] = '+'
+    TBLENCWWWCOMP_.freeze
 
-  256.times do |i|
-    h, l = i>>4, i&15
-    TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+    256.times do |i|
+      h, l = i>>4, i&15
+      TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+    end
+    TBLDECWWWCOMP_['+'] = ' '
+    TBLDECWWWCOMP_.freeze
+  rescue Exception
   end
-  TBLDECWWWCOMP_['+'] = ' '
-  TBLDECWWWCOMP_.freeze
 end
 
 # :startdoc:

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/reactor.rb

@@ -28,6 +28,7 @@ module Puma
         begin
           ready = IO.select sockets, nil, nil, @sleep_for
         rescue IOError => e
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
           if sockets.any? { |socket| socket.closed? }
             STDERR.puts "Error in select: #{e.message} (#{e.class})"
             STDERR.puts e.backtrace
@@ -75,8 +76,19 @@ module Puma
                   sockets.delete c
                 end
 
+              # Don't report these to the lowlevel_error handler, otherwise
+              # will be flooding them with errors when persistent connections
+              # are closed.
+              rescue ConnectionError
+                c.write_500
+                c.close
+
+                sockets.delete c
+
               # SSL handshake failure
               rescue MiniSSL::SSLError => e
+                @server.lowlevel_error(e, c.env)
+
                 ssl_socket = c.io
                 addr = ssl_socket.peeraddr.last
                 cert = ssl_socket.peercert
@@ -88,6 +100,8 @@ module Puma
 
               # The client doesn't know HTTP well
               rescue HttpParserError => e
+                @server.lowlevel_error(e, c.env)
+
                 c.write_400
                 c.close
 
@@ -95,6 +109,8 @@ module Puma
 
                 @events.parse_error @server, c.env, e
               rescue StandardError => e
+                @server.lowlevel_error(e, c.env)
+
                 c.write_500
                 c.close
 
@@ -180,6 +196,7 @@ module Puma
       begin
         @trigger << "c"
       rescue IOError
+        Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
       end
     end
 
@@ -187,6 +204,7 @@ module Puma
       begin
         @trigger << "!"
       rescue IOError
+        Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
       end
 
       @thread.join

data/lib/puma/runner.rb

@@ -1,7 +1,11 @@
+require 'puma/server'
+require 'puma/const'
+
 module Puma
   class Runner
-    def initialize(cli)
-      @cli = cli
+    def initialize(cli, events)
+      @launcher = cli
+      @events = events
       @options = cli.options
       @app = nil
       @control = nil
@@ -16,15 +20,19 @@ module Puma
     end
 
     def log(str)
-      @cli.log str
+      @events.log str
+    end
+
+    def before_restart
+      @control.stop(true) if @control
     end
 
     def error(str)
-      @cli.error str
+      @events.error str
     end
 
-    def before_restart
-      @control.stop(true) if @control
+    def debug(str)
+      @events.log "- #{str}" if @options[:debug]
     end
 
     def start_control
@@ -35,13 +43,13 @@ module Puma
 
       uri = URI.parse str
 
-      app = Puma::App::Status.new @cli
+      app = Puma::App::Status.new @launcher
 
       if token = @options[:control_auth_token]
         app.auth_token = token unless token.empty? or token == :none
       end
 
-      control = Puma::Server.new app, @cli.events
+      control = Puma::Server.new app, @launcher.events
       control.min_threads = 0
       control.max_threads = 1
 
@@ -67,7 +75,11 @@ module Puma
       if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
         "ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
       else
-        "#{RUBY_ENGINE} #{RUBY_VERSION}"
+        if defined?(RUBY_ENGINE_VERSION)
+          "#{RUBY_ENGINE} #{RUBY_ENGINE_VERSION} - ruby #{RUBY_VERSION}"
+        else
+          "#{RUBY_ENGINE} #{RUBY_VERSION}"
+        end
       end
     end
 
@@ -85,18 +97,30 @@ module Puma
       end
     end
 
+    def redirected_io?
+      @options[:redirect_stdout] || @options[:redirect_stderr]
+    end
+
     def redirect_io
       stdout = @options[:redirect_stdout]
       stderr = @options[:redirect_stderr]
       append = @options[:redirect_append]
 
       if stdout
+        unless Dir.exist?(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.exist?(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} ==="
@@ -104,39 +128,43 @@ module Puma
     end
 
     def load_and_bind
-      unless @cli.config.app_configured?
+      unless @launcher.config.app_configured?
         error "No application configured, nothing to run"
         exit 1
       end
 
       # Load the app before we daemonize.
       begin
-        @app = @cli.config.app
+        @app = @launcher.config.app
       rescue Exception => e
         log "! Unable to load application: #{e.class}: #{e.message}"
         raise e
       end
 
-      @cli.binder.parse @options[:binds], self
+      @launcher.binder.parse @options[:binds], self
     end
 
     def app
-      @app ||= @cli.config.app
+      @app ||= @launcher.config.app
     end
 
     def start_server
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
-      server = Puma::Server.new app, @cli.events, @options
+      server = Puma::Server.new app, @launcher.events, @options
       server.min_threads = min_t
       server.max_threads = max_t
-      server.inherit_binder @cli.binder
+      server.inherit_binder @launcher.binder
 
       if @options[:mode] == :tcp
         server.tcp_mode!
       end
 
+      if @options[:early_hints]
+        server.early_hints = true
+      end
+
       unless development?
         server.leak_stack_on_error = false
       end