jun-puma 1.0.0-java → 1.0.1-java

data/lib/puma/client.rb

@@ -51,14 +51,6 @@ module Puma
     CHUNK_VALID_ENDING = Const::LINE_END
     CHUNK_VALID_ENDING_SIZE = CHUNK_VALID_ENDING.bytesize
 
-    # The maximum number of bytes we'll buffer looking for a valid
-    # chunk header.
-    MAX_CHUNK_HEADER_SIZE = 4096
-
-    # The maximum amount of excess data the client sends
-    # using chunk size extensions before we abort the connection.
-    MAX_CHUNK_EXCESS = 16 * 1024
-
     # Content-Length header value validation
     CONTENT_LENGTH_VALUE_INVALID = /[^\d]/.freeze
 
@@ -160,6 +152,8 @@ module Puma
       @read_header = true
       @read_proxy = !!@expect_proxy_proto
       @env = @proto_env.dup
+      @body = nil
+      @tempfile = nil
       @parsed_bytes = 0
       @ready = false
       @body_remain = 0
@@ -188,11 +182,11 @@ module Puma
         rescue IOError
           # swallow it
         end
+
       end
     end
 
     def close
-      tempfile_close
       begin
         @io.close
       rescue IOError, Errno::EBADF
@@ -200,15 +194,6 @@ module Puma
       end
     end
 
-    def tempfile_close
-      tf_path = @tempfile&.path
-      @tempfile&.close
-      File.unlink(tf_path) if tf_path
-      @tempfile = nil
-      @body = nil
-    rescue Errno::ENOENT, IOError
-    end
-
     # If necessary, read the PROXY protocol from the buffer. Returns
     # false if more data is needed.
     def try_to_parse_proxy_protocol
@@ -247,7 +232,6 @@ module Puma
 
       return read_body if in_data_phase
 
-      data = nil
       begin
         data = @io.read_nonblock(CHUNK_SIZE)
       rescue IO::WaitReadable
@@ -411,33 +395,18 @@ module Puma
         return true
       end
 
-      content_length = cl.to_i
-
-      remain = content_length - body.bytesize
+      remain = cl.to_i - body.bytesize
 
       if remain <= 0
-        # Part of the body is a pipelined request OR garbage. We'll deal with that later.
-        if content_length == 0
-          @body = EmptyBody
-          if body.empty?
-            @buffer = nil
-          else
-            @buffer = body
-          end
-        elsif remain == 0
-          @body = StringIO.new body
-          @buffer = nil
-        else
-          @body = StringIO.new(body[0,content_length])
-          @buffer = body[content_length..-1]
-        end
+        @body = StringIO.new(body)
+        @buffer = nil
         set_ready
         return true
       end
 
       if remain > MAX_BODY
-        @body = Tempfile.create(Const::PUMA_TMP_BASE)
-        File.unlink @body.path unless IS_WINDOWS
+        @body = Tempfile.new(Const::PUMA_TMP_BASE)
+        @body.unlink
         @body.binmode
         @tempfile = @body
       else
@@ -527,10 +496,9 @@ module Puma
       @chunked_body = true
       @partial_part_left = 0
       @prev_chunk = ""
-      @excess_cr = 0
 
-      @body = Tempfile.create(Const::PUMA_TMP_BASE)
-      File.unlink @body.path unless IS_WINDOWS
+      @body = Tempfile.new(Const::PUMA_TMP_BASE)
+      @body.unlink
       @body.binmode
       @tempfile = @body
       @chunked_content_length = 0
@@ -609,20 +577,6 @@ module Puma
             end
           end
 
-          # Track the excess as a function of the size of the
-          # header vs the size of the actual data. Excess can
-          # go negative (and is expected to) when the body is
-          # significant.
-          # The additional of chunk_hex.size and 2 compensates
-          # for a client sending 1 byte in a chunked body over
-          # a long period of time, making sure that that client
-          # isn't accidentally eventually punished.
-          @excess_cr += (line.size - len - chunk_hex.size - 2)
-
-          if @excess_cr >= MAX_CHUNK_EXCESS
-            raise HttpParserError, "Maximum chunk excess detected"
-          end
-
           len += 2
 
           part = io.read(len)
@@ -650,10 +604,6 @@ module Puma
             @partial_part_left = len - part.size
           end
         else
-          if @prev_chunk.size + line.size >= MAX_CHUNK_HEADER_SIZE
-            raise HttpParserError, "maximum size of chunk header exceeded"
-          end
-
           @prev_chunk = line
           return false
         end

data/lib/puma/cluster/worker.rb

@@ -92,21 +92,21 @@ module Puma
                 restart_server << true << false
               else # fork worker
                 worker_pids << pid = spawn_worker(idx)
-                @worker_write << "#{Puma::Const::PipeRequest::FORK}#{pid}:#{idx}\n" rescue nil
+                @worker_write << "f#{pid}:#{idx}\n" rescue nil
               end
             end
           end
         end
 
         Signal.trap "SIGTERM" do
-          @worker_write << "#{Puma::Const::PipeRequest::EXTERNAL_TERM}#{Process.pid}\n" rescue nil
+          @worker_write << "e#{Process.pid}\n" rescue nil
           restart_server.clear
           server.stop
           restart_server << false
         end
 
         begin
-          @worker_write << "#{Puma::Const::PipeRequest::BOOT}#{Process.pid}:#{index}\n"
+          @worker_write << "b#{Process.pid}:#{index}\n"
         rescue SystemCallError, IOError
           Puma::Util.purge_interrupt_queue
           STDERR.puts "Master seems to have exited, exiting."
@@ -146,8 +146,10 @@ module Puma
         # Invoke any worker shutdown hooks so they can prevent the worker
         # exiting until any background operations are completed
         @config.run_hooks(:before_worker_shutdown, index, @log_writer, @hook_data)
+
+        Process.kill "SIGTERM", master if server.idle_timeout_reached
       ensure
-        @worker_write << "#{Puma::Const::PipeRequest::TERM}#{Process.pid}\n" rescue nil
+        @worker_write << "t#{Process.pid}\n" rescue nil
         @worker_write.close
       end
 

data/lib/puma/cluster/worker_handle.rb

@@ -51,12 +51,13 @@ module Puma
         @term
       end
 
-      STATUS_PATTERN = /{ "backlog":(?<backlog>\d*), "running":(?<running>\d*), "pool_capacity":(?<pool_capacity>\d*), "max_threads": (?<max_threads>\d*), "requests_count": (?<requests_count>\d*) }/
-      private_constant :STATUS_PATTERN
-
       def ping!(status)
         @last_checkin = Time.now
-        @last_status = status.match(STATUS_PATTERN).named_captures.map { |c_name, c| [c_name.to_sym, c.to_i] }.to_h
+        captures = status.match(/{ "backlog":(?<backlog>\d*), "running":(?<running>\d*), "pool_capacity":(?<pool_capacity>\d*), "max_threads": (?<max_threads>\d*), "requests_count": (?<requests_count>\d*) }/)
+        @last_status = captures.names.inject({}) do |hash, key|
+          hash[key.to_sym] = captures[key].to_i
+          hash
+        end
       end
 
       # @see Puma::Cluster#check_workers

data/lib/puma/cluster.rb

@@ -158,10 +158,6 @@ module Puma
       @workers.all? { |w| w.phase == @phase }
     end
 
-    def all_workers_idle_timed_out?
-      (@workers.map(&:pid) - idle_timed_out_worker_pids).empty?
-    end
-
     def check_workers
       return if @next_check >= Time.now
 
@@ -421,8 +417,6 @@ module Puma
 
       @master_read, @worker_write = read, @wakeup
 
-      @options[:worker_write] = @worker_write
-
       @config.run_hooks(:before_fork, nil, @log_writer)
 
       spawn_workers
@@ -438,11 +432,6 @@ module Puma
 
         while @status == :run
           begin
-            if @options[:idle_timeout] && all_workers_idle_timed_out?
-              log "- All workers reached idle timeout"
-              break
-            end
-
             if @phased_restart
               start_phased_restart
               @phased_restart = false
@@ -454,17 +443,14 @@ module Puma
 
             if read.wait_readable([0, @next_check - Time.now].max)
               req = read.read_nonblock(1)
-              next unless req
 
-              if req == Puma::Const::PipeRequest::WAKEUP
-                @next_check = Time.now
-                next
-              end
+              @next_check = Time.now if req == "!"
+              next if !req || req == "!"
 
               result = read.gets
               pid = result.to_i
 
-              if req == Puma::Const::PipeRequest::BOOT || req == Puma::Const::PipeRequest::FORK
+              if req == "b" || req == "f"
                 pid, idx = result.split(':').map(&:to_i)
                 w = worker_at idx
                 w.pid = pid if w.pid.nil?
@@ -472,17 +458,17 @@ module Puma
 
               if w = @workers.find { |x| x.pid == pid }
                 case req
-                when Puma::Const::PipeRequest::BOOT
+                when "b"
                   w.boot!
                   log "- Worker #{w.index} (PID: #{pid}) booted in #{w.uptime.round(2)}s, phase: #{w.phase}"
                   @next_check = Time.now
                   workers_not_booted -= 1
-                when Puma::Const::PipeRequest::EXTERNAL_TERM
+                when "e"
                   # external term, see worker method, Signal.trap "SIGTERM"
                   w.term!
-                when Puma::Const::PipeRequest::TERM
+                when "t"
                   w.term unless w.term?
-                when Puma::Const::PipeRequest::PING
+                when "p"
                   status = result.sub(/^\d+/,'').chomp
                   w.ping!(status)
                   @events.fire(:ping!, w)
@@ -497,23 +483,17 @@ module Puma
                     debug_loaded_extensions("Loaded Extensions - master:") if @log_writer.debug?
                     booted = true
                   end
-                when Puma::Const::PipeRequest::IDLE
-                  if idle_workers[pid]
-                    idle_workers.delete pid
-                  else
-                    idle_workers[pid] = true
-                  end
                 end
               else
                 log "! Out-of-sync worker list, no #{pid} worker"
               end
             end
-
             if in_phased_restart && workers_not_booted.zero?
               @events.fire_on_booted!
               debug_loaded_extensions("Loaded Extensions - master:") if @log_writer.debug?
               in_phased_restart = false
             end
+
           rescue Interrupt
             @status = :stop
           end
@@ -542,31 +522,10 @@ module Puma
     # loops thru @workers, removing workers that exited, and calling
     # `#term` if needed
     def wait_workers
-      # Reap all children, known workers or otherwise.
-      # If puma has PID 1, as it's common in containerized environments,
-      # then it's responsible for reaping orphaned processes, so we must reap
-      # all our dead children, regardless of whether they are workers we spawned
-      # or some reattached processes.
-      reaped_children = {}
-      loop do
-        begin
-          pid, status = Process.wait2(-1, Process::WNOHANG)
-          break unless pid
-          reaped_children[pid] = status
-        rescue Errno::ECHILD
-          break
-        end
-      end
-
       @workers.reject! do |w|
         next false if w.pid.nil?
         begin
-          # We may need to check the PID individually because:
-          # 1. From Ruby versions 2.6 to 3.2, `Process.detach` can prevent or delay
-          #    `Process.wait2(-1)` from detecting a terminated process: https://bugs.ruby-lang.org/issues/19837.
-          # 2. When `fork_worker` is enabled, some worker may not be direct children,
-          #    but grand children.  Because of this they won't be reaped by `Process.wait2(-1)`.
-          if reaped_children.delete(w.pid) || Process.wait(w.pid, Process::WNOHANG)
+          if Process.wait(w.pid, Process::WNOHANG)
             true
           else
             w.term if w.term?
@@ -583,11 +542,6 @@ module Puma
           end
         end
       end
-
-      # Log unknown children
-      reaped_children.each do |pid, status|
-        log "! reaped unknown child process pid=#{pid} status=#{status}"
-      end
     end
 
     # @version 5.0.0
@@ -604,13 +558,5 @@ module Puma
         end
       end
     end
-
-    def idle_timed_out_worker_pids
-      idle_workers.keys
-    end
-
-    def idle_workers
-      @idle_workers ||= {}
-    end
   end
 end

data/lib/puma/configuration.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'rack/builder'
 require_relative 'plugin'
 require_relative 'const'
-require_relative 'dsl'
+# note that dsl is loaded at end of file, requires ConfigDefault constants
 
 module Puma
   # A class used for storing "leveled" configuration options.
@@ -130,7 +131,6 @@ module Puma
       binds: ['tcp://0.0.0.0:9292'.freeze],
       clean_thread_locals: false,
       debug: false,
-      enable_keep_alives: true,
       early_hints: nil,
       environment: 'development'.freeze,
       # Number of seconds to wait until we get the first data for the request.
@@ -173,8 +173,8 @@ module Puma
       http_content_length_limit: nil
     }
 
-    def initialize(user_options={}, default_options = {}, env = ENV, &block)
-      default_options = self.puma_default_options(env).merge(default_options)
+    def initialize(user_options={}, default_options = {}, &block)
+      default_options = self.puma_default_options.merge(default_options)
 
       @options     = UserFileDefaultOptions.new(user_options, default_options)
       @plugins     = PluginLoader.new
@@ -186,8 +186,6 @@ module Puma
         default_options[:preload_app] = (@options[:workers] > 1) && Puma.forkable?
       end
 
-      @puma_bundler_pruned = env.key? 'PUMA_BUNDLER_PRUNED'
-
       if block
         configure(&block)
       end
@@ -218,22 +216,22 @@ module Puma
       self
     end
 
-    def puma_default_options(env = ENV)
+    def puma_default_options
       defaults = DEFAULTS.dup
-      puma_options_from_env(env).each { |k,v| defaults[k] = v if v }
+      puma_options_from_env.each { |k,v| defaults[k] = v if v }
       defaults
     end
 
-    def puma_options_from_env(env = ENV)
-      min = env['PUMA_MIN_THREADS'] || env['MIN_THREADS']
-      max = env['PUMA_MAX_THREADS'] || env['MAX_THREADS']
-      workers = env['WEB_CONCURRENCY']
+    def puma_options_from_env
+      min = ENV['PUMA_MIN_THREADS'] || ENV['MIN_THREADS']
+      max = ENV['PUMA_MAX_THREADS'] || ENV['MAX_THREADS']
+      workers = ENV['WEB_CONCURRENCY']
 
       {
         min_threads: min && Integer(min),
         max_threads: max && Integer(max),
         workers: workers && Integer(workers),
-        environment: env['APP_ENV'] || env['RACK_ENV'] || env['RAILS_ENV'],
+        environment: ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'],
       }
     end
 
@@ -346,7 +344,7 @@ module Puma
     def rack_builder
       # Load bundler now if we can so that we can pickup rack from
       # a Gemfile
-      if @puma_bundler_pruned
+      if ENV.key? 'PUMA_BUNDLER_PRUNED'
         begin
           require 'bundler/setup'
         rescue LoadError
@@ -356,10 +354,11 @@ module Puma
       begin
         require 'rack'
         require 'rack/builder'
-        ::Rack::Builder
       rescue LoadError
-        require_relative 'rack/builder'
-        Puma::Rack::Builder
+        # ok, use builtin version
+        return Puma::Rack::Builder
+      else
+        return ::Rack::Builder
       end
     end
 
@@ -388,3 +387,5 @@ module Puma
     end
   end
 end
+
+require_relative 'dsl'

data/lib/puma/const.rb

@@ -100,8 +100,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.0.0"
-    CODE_NAME = "The Eagle of Durango - Jun"
+    PUMA_VERSION = VERSION = "1.0.1"
+    CODE_NAME = "The Eagle of Durango - Jun - 6.4.1"
 
     PUMA_SERVER_STRING = ["puma", PUMA_VERSION, CODE_NAME].join(" ").freeze
 
@@ -281,27 +281,9 @@ module Puma
     # header values can contain HTAB?
     ILLEGAL_HEADER_VALUE_REGEX = /[\x00-\x08\x0A-\x1F]/.freeze
 
-    # The keys of headers that should not be convert to underscore
-    # normalized versions. These headers are ignored at the request reading layer,
-    # but if we normalize them after reading, it's just confusing for the application.
-    UNMASKABLE_HEADERS = {
-      "HTTP_TRANSFER,ENCODING" => true,
-      "HTTP_CONTENT,LENGTH" => true,
-    }
-
     # Banned keys of response header
     BANNED_HEADER_KEY = /\A(rack\.|status\z)/.freeze
 
     PROXY_PROTOCOL_V1_REGEX = /^PROXY (?:TCP4|TCP6|UNKNOWN) ([^\r]+)\r\n/.freeze
-
-    module PipeRequest
-      WAKEUP = "!"
-      BOOT = "b"
-      FORK = "f"
-      EXTERNAL_TERM = "e"
-      TERM = "t"
-      PING = "p"
-      IDLE = "i"
-    end
   end
 end

data/lib/puma/control_cli.rb

@@ -37,7 +37,7 @@ module Puma
     # @version 5.0.0
     PRINTABLE_COMMANDS = %w[gc-stats stats thread-backtraces].freeze
 
-    def initialize(argv, stdout=STDOUT, stderr=STDERR, env: ENV)
+    def initialize(argv, stdout=STDOUT, stderr=STDERR)
       @state = nil
       @quiet = false
       @pidfile = nil
@@ -46,7 +46,7 @@ module Puma
       @control_auth_token = nil
       @config_file = nil
       @command = nil
-      @environment = env['APP_ENV'] || env['RACK_ENV'] || env['RAILS_ENV']
+      @environment = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']
 
       @argv = argv.dup
       @stdout = stdout
@@ -60,7 +60,7 @@ module Puma
           @state = arg
         end
 
-        o.on "-Q", "--quiet", "Do not display messages" do |arg|
+        o.on "-Q", "--quiet", "Not display messages" do |arg|
           @quiet = true
         end
 
@@ -127,7 +127,7 @@ module Puma
           require_relative 'configuration'
           require_relative 'log_writer'
 
-          config = Puma::Configuration.new({ config_files: [@config_file] }, {} , env)
+          config = Puma::Configuration.new({ config_files: [@config_file] }, {})
           config.load
           @state              ||= config.options[:state]
           @control_url        ||= config.options[:control_url]