puma 8.0.3-java → 8.1.0-java

data/lib/puma/launcher.rb

@@ -78,6 +78,7 @@ module Puma
       @binder = Binder.new(@log_writer, @options)
       @binder.create_inherited_fds(env).each { |k| env.delete k }
       @binder.create_activated_fds(env).each { |k| env.delete k }
+      @control_activated_socket = @binder.take_activated_socket(@options[:control_url]) if @options[:control_url]
 
       @environment = @config.environment
 
@@ -112,7 +113,7 @@ module Puma
       @status = :run
     end
 
-    attr_reader :binder, :log_writer, :events, :config, :options, :restart_dir
+    attr_reader :binder, :log_writer, :events, :config, :options, :restart_dir, :control_activated_socket
 
     # Return stats about the server
     def stats
@@ -187,6 +188,9 @@ module Puma
       if clustered? && @runner.respond_to?(:fork_worker!) && @options[:fork_worker]
         @runner.fork_worker!
         true
+      elsif clustered? && @runner.respond_to?(:mold_worker!) && @options[:mold_worker]
+        @runner.mold_worker!
+        true
       else
         log "* refork called but not available."
         false
@@ -197,8 +201,6 @@ module Puma
     def run
       previous_env = get_env
 
-      @config.clamp
-
       @config.plugins.fire_starts self
 
       setup_signals
@@ -282,8 +284,8 @@ module Puma
     end
 
     def do_graceful_stop
-      @events.fire_after_stopped!
       @runner.stop_blocked
+      @events.fire_after_stopped!
     end
 
     def do_restart(previous_env)

data/lib/puma/minissl.rb

@@ -97,7 +97,7 @@ module Puma
           # It would make more sense to let @socket.read_nonblock raise
           # EAGAIN if necessary but it seems like it'll misbehave on Windows.
           # I don't have a Windows machine to debug this so I can't explain
-          # exactly whats happening in that OS. Please let me know if you
+          # exactly what's happening in that OS. Please let me know if you
           # find out!
           #
           # In the meantime, we can emulate the correct behavior by

data/lib/puma/plugin/systemd.rb

@@ -5,7 +5,7 @@ require_relative '../plugin'
 # Puma's systemd integration allows Puma to inform systemd:
 #  1. when it has successfully started
 #  2. when it is starting shutdown
-#  3. periodically for a liveness check with a watchdog thread
+#  3. at startup and then periodically for a liveness check with a watchdog thread
 #  4. periodically set the status
 Puma::Plugin.create do
   def start(launcher)

data/lib/puma/response.rb

@@ -75,6 +75,7 @@ module Puma
       end
 
       env["puma.mark_as_io_bound"] = -> { processor.mark_as_io_thread! }
+      env["puma.connection_closed?"] = -> { closed_socket?(socket) }
 
       begin
         status, headers, app_body = @thread_pool.with_force_shutdown do
@@ -165,7 +166,7 @@ module Puma
       if res_body.respond_to?(:each) && !resp_info[:response_hijack]
         # below converts app_body into body, dependent on app_body's characteristics, and
         # content_length will be set if it can be determined
-        if !content_length && !resp_info[:transfer_encoding] && status != 204
+        if !content_length && !resp_info[:transfer_encoding] && status != 204 && status != 304
           if res_body.respond_to?(:to_ary) && (array_body = res_body.to_ary) &&
               array_body.is_a?(Array)
             body = array_body.compact
@@ -176,16 +177,16 @@ module Puma
           elsif res_body.respond_to?(:to_path) && (fn = res_body.to_path) &&
               File.readable?(fn)
             body = File.open fn, 'rb'
-            content_length = body.size
             close_body = true
+            content_length = body.size
           else
             body = res_body
           end
         elsif !res_body.is_a?(::File) && res_body.respond_to?(:to_path) &&
             (fn = res_body.to_path) && File.readable?(fn = res_body.to_path)
           body = File.open fn, 'rb'
-          content_length = body.size
           close_body = true
+          content_length = body.size
         elsif !res_body.is_a?(::File) && res_body.respond_to?(:filename) &&
             res_body.respond_to?(:bytesize) && File.readable?(fn = res_body.filename)
           # Sprockets::Asset
@@ -246,10 +247,11 @@ module Puma
       end
 
       fast_write_response socket, body, io_buffer, chunked, content_length.to_i
-      body.close if close_body
 
       # if we're shutting down, close keep_alive connections
       !shutting_down? && keep_alive ? :keep_alive : :close
+    ensure
+      body.close if close_body
     end
 
     def write_pending_interim(socket, client)
@@ -430,6 +432,12 @@ module Puma
     end
     private :fetch_status_code
 
+    def request_has_close?(env)
+      conn = env.fetch(HTTP_CONNECTION, "").downcase
+      conn.include?(CLOSE) && conn.split(",").any? { |option| option.strip == CLOSE }
+    end
+    private :request_has_close?
+
     # Processes and write headers to the IOBuffer.
     # @param env [Hash] see Puma::Client#env, from request
     # @param status [Integer] the status returned by the Rack application
@@ -453,7 +461,7 @@ module Puma
       http_11 = env[SERVER_PROTOCOL] == HTTP_11
       if http_11
         resp_info[:allow_chunked] = true
-        resp_info[:keep_alive] = env.fetch(HTTP_CONNECTION, "").downcase != CLOSE
+        resp_info[:keep_alive] = !request_has_close?(env)
 
         # An optimization. The most common response is 200, so we can
         # reply with the proper 200 status without having to compute

data/lib/puma/runner.rb

@@ -30,7 +30,7 @@ module Puma
     def wakeup!
       return unless @wakeup
 
-      @wakeup.write PIPE_WAKEUP unless @wakeup.closed?
+      @wakeup.write_nonblock(PIPE_WAKEUP) unless @wakeup.closed?
 
     rescue SystemCallError, IOError
     end
@@ -77,6 +77,10 @@ module Puma
       control = Puma::Server.new app, nil,
         { min_threads: 0, max_threads: 1, queue_requests: false, log_writer: @log_writer }
 
+      if (activated = @launcher.control_activated_socket)
+        control.binder.activated_sockets.store(*activated)
+      end
+
       begin
         control.binder.parse [str], nil, 'Starting control server'
       rescue Errno::EADDRINUSE, Errno::EACCES => e

data/lib/puma/sd_notify.rb

@@ -49,8 +49,11 @@ module Puma
     WATCHDOG  = "WATCHDOG=1"
     FDSTORE   = "FDSTORE=1"
 
+    # @note When the service manager expects watchdog pings, this sends an
+    #   immediate `WATCHDOG=1` in the same datagram, which closes the watchdog
+    #   timeout window between startup and the first periodic watchdog tick.
     def self.ready(unset_env=false)
-      notify(READY, unset_env)
+      notify(watchdog? ? "#{READY}\n#{WATCHDOG}" : READY, unset_env)
     end
 
     def self.reloading(unset_env=false)

data/lib/puma/server.rb

@@ -109,6 +109,8 @@ module Puma
       @enable_keep_alives      &&= @queue_requests
       @io_selector_backend       = @options[:io_selector_backend]
       @http_content_length_limit = @options[:http_content_length_limit]
+      @continue_callback         = @options[:continue_callback]
+      @allow_underscore_headers  = @options.fetch(:allow_underscore_headers, true)
       @cluster_accept_loop_delay = ClusterAcceptLoopDelay.new(
         workers: @options[:workers],
         max_delay: @options[:wait_for_less_busy_worker] || 0 # Real default is in Configuration::DEFAULTS, this is for unit testing
@@ -412,13 +414,21 @@ module Puma
                 # clients until the code is finished.
                 pool.wait_while_out_of_band_running
 
-                # A well rested herd (cluster) runs faster
-                if @cluster_accept_loop_delay.on? && (busy_threads_plus_todo = pool.busy_threads) > 0
-                  delay = @cluster_accept_loop_delay.calculate(
-                    max_threads: @max_threads,
-                    busy_threads_plus_todo: busy_threads_plus_todo
-                  )
-                  sleep(delay)
+                unless shutting_down?
+                  if @queue_requests
+                    if @cluster_accept_loop_delay.on? && (busy_threads_plus_todo = pool.busy_threads) > 0
+                      delay = @cluster_accept_loop_delay.calculate(
+                        max_threads: @max_threads,
+                        busy_threads_plus_todo: busy_threads_plus_todo
+                      )
+                      sleep(delay)
+                    end
+                  else
+                    pool.wait_until_not_full
+
+                    # A stop may have arrived while waiting for a thread
+                    break if check.wait_readable(0) && handle_check
+                  end
                 end
 
                 io = begin
@@ -486,12 +496,14 @@ module Puma
       client.env_set_http_version = @env_set_http_version
       client.http_content_length_limit = @http_content_length_limit
       client.supported_http_methods = @supported_http_methods
+      client.allow_underscore_headers = @allow_underscore_headers
+      client.continue_callback = @continue_callback
       client
     end
 
     # :nodoc:
     def handle_check
-      cmd = @check.read(1)
+      cmd = @check.sysread 1
 
       case cmd
       when STOP_COMMAND
@@ -568,8 +580,12 @@ module Puma
               if @thread_pool.waiting > 0
                 can_loop = true
               else
-                @thread_pool << client
-                close_socket = false
+                @thread_pool.with_mutex do
+                  unless shutting_down?
+                    @thread_pool << client
+                    close_socket = false
+                  end
+                end
               end
             elsif @queue_requests
               client.set_timeout @persistent_timeout
@@ -646,6 +662,13 @@ module Puma
       when HttpParserError501
         response_to_error(client, requests, e, 501)
         @log_writer.parse_error e, client
+      when ContinueRejected
+        status, headers, res_body = e.response
+        begin
+          prepare_response(status, headers, res_body, requests, client)
+        ensure
+          res_body.close if res_body.respond_to? :close
+        end
       else
         response_to_error(client, requests, e, 500)
         @log_writer.unknown_error e, nil, "Read"
@@ -708,16 +731,18 @@ module Puma
     end
 
     def notify_safely(message)
-      @notify << message
-    rescue IOError, NoMethodError, Errno::EPIPE, Errno::EBADF
-      # The server, in another thread, is shutting down
-    rescue RuntimeError => e
-      # Temporary workaround for https://bugs.ruby-lang.org/issues/13239
-      if e.message.include?('IOError')
-        # ignore
-      else
-        raise e
-      end
+      # Use write_nonblock rather than `<<` or `syswrite`. This method is
+      # called from signal handlers (TERM/USR2/INT/HUP, and the cluster
+      # worker's SIGTERM trap). On Ruby < 4.0, a blocking write from trap
+      # context that is still in flight when handle_servers' ensure block
+      # runs IO#close leaves the closing thread parked in IO#close forever
+      # (puma#3677). write_nonblock is a single write(2) that never waits,
+      # so IO#close has nothing to wait for. If the pipe is full a command
+      # is already pending, so dropping this one is harmless.
+      notify = @notify
+      notify.write_nonblock(message, exception: false) if notify && !notify.closed?
+    rescue IOError, NoMethodError, Errno::EPIPE, Errno::EBADF => e
+      @log_writer.unknown_error(e, nil, "notify_safely error") if Puma::IS_MRI && RUBY_VERSION > '3.3'
     end
     private :notify_safely
 

data/lib/puma/thread_pool.rb

@@ -7,7 +7,6 @@ require_relative 'server_plugin_control'
 
 module Puma
 
-  # Add `Thread#puma_server` and `Thread#puma_server=`
   Thread.attr_accessor(:puma_server)
 
   # Internal Docs for A simple thread pool management object.
@@ -211,6 +210,7 @@ module Puma
                 processor.marked_as_io_thread = false
               else
                 # We're already at max threads, so we exit the extra io thread.
+                @spawned -= 1
                 @processors.delete(processor)
                 trigger_before_thread_exit_hooks
                 Thread.exit
@@ -314,6 +314,17 @@ module Puma
       end
     end
 
+    def wait_until_not_full
+      with_mutex do
+        while true
+          return if @shutdown
+          return if (@spawned - @waiting + @todo.size) < @max
+
+          @not_full.wait @mutex
+        end
+      end
+    end
+
     # @version 5.0.0
     def with_mutex(&block)
       @mutex.owned? ?

data/lib/puma.rb

@@ -82,7 +82,7 @@ module Puma
   #
   def self.deprecate_method_change(method_old, method_caller, method_new)
     if method_old == method_caller
-      warn "Use '#{method_new}', '#{method_caller}' is deprecated and will be removed in v8"
+      warn "Use '#{method_new}', '#{method_caller}' is deprecated and will be removed in Puma v9"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 8.1.0
 platform: java
 authors:
 - Evan Phoenix
@@ -65,6 +65,7 @@ files:
 - docs/kubernetes.md
 - docs/nginx.md
 - docs/plugins.md
+- docs/puma_support.md
 - docs/rails_dev_mode.md
 - docs/restart.md
 - docs/signals.md
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.23
+rubygems_version: 4.0.21
 specification_version: 4
 summary: A Ruby/Rack web server built for parallelism.
 test_files: []