puma 8.0.3-java → 8.1.0-java

data/lib/puma/configuration.rb

@@ -133,6 +133,7 @@ module Puma
     class NotClampedError < StandardError; end
 
     DEFAULTS = {
+      allow_underscore_headers: true,
       auto_trim_time: 30,
       binds: ['tcp://[::]:9292'.freeze],
       debug: false,
@@ -284,11 +285,17 @@ module Puma
     #
     # This also calls load if it hasn't been called yet.
     def clamp
+      if @clamped
+        warn "Configuration already clamped, calling clamp multiple times is deprecated and will raise in Puma v9"
+        return options
+      end
+
       load unless @loaded
       run_mode_hooks
       set_conditional_default_options
       @_options.finalize_values
       rewrite_unavailable_ipv6_binds!
+      validate_options
       @clamped = true
       warn_hooks
       options
@@ -357,8 +364,7 @@ module Puma
             block.call arg
           end
         rescue => e
-          log_writer.log "WARNING hook #{key} failed with exception (#{e.class}) #{e.message}"
-          log_writer.debug e.backtrace.join("\n")
+          handle_hook_error e, key, log_writer
         end
       end
     end
@@ -399,6 +405,15 @@ module Puma
 
     private
 
+    def handle_hook_error(e, key, log_writer)
+      if (handler = options[:hook_error_handler])
+        handler.call(e, key)
+      else
+        log_writer.log "WARNING hook #{key} failed with exception (#{e.class}) #{e.message}"
+        log_writer.debug e.backtrace.join("\n")
+      end
+    end
+
     def rewrite_unavailable_ipv6_binds!
       return if self.class.ipv6_interface_available?
 
@@ -492,7 +507,7 @@ module Puma
       @_options.all_of(key).each(&:call)
 
       unless @_options[:workers] == workers_before
-        raise "cannot change the number of workers inside a #{key} configuration hook"
+        raise "Cannot change the number of workers inside a #{key} configuration hook"
       end
     end
 
@@ -501,6 +516,10 @@ module Puma
         (@_options[:workers] > 1) && Puma.forkable?
     end
 
+    def validate_options
+      raise "fork_worker and mold_worker cannot be used together" if @_options[:fork_worker] && @_options[:mold_worker]
+    end
+
     def warn_hooks
       return if options[:workers] > 0
       return if options[:silence_fork_callback_warning]

data/lib/puma/const.rb

@@ -100,8 +100,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "8.0.3"
-    CODE_NAME = "Into the Arena"
+    PUMA_VERSION = VERSION = "8.1.0"
+    CODE_NAME = "Puma Psychosis"
 
     PUMA_SERVER_STRING = ["puma", PUMA_VERSION, CODE_NAME].join(" ").freeze
 
@@ -150,12 +150,12 @@ module Puma
     REQUEST_METHOD = "REQUEST_METHOD"
     HEAD = "HEAD"
 
-    # based on https://www.rfc-editor.org/rfc/rfc9110.html#name-overview,
-    # with CONNECT removed, and PATCH added
-    SUPPORTED_HTTP_METHODS = %w[HEAD GET POST PUT DELETE OPTIONS TRACE PATCH].freeze
+    # based on https://www.rfc-editor.org/rfc/rfc9110.html#name-overview and https://www.rfc-editor.org/rfc/rfc10008.html,
+    # with CONNECT removed, and PATCH & QUERY added
+    SUPPORTED_HTTP_METHODS = %w[HEAD GET POST PUT DELETE OPTIONS TRACE PATCH QUERY].freeze
 
     # list from https://www.iana.org/assignments/http-methods/http-methods.xhtml
-    # as of 04-May-23
+    # as of 17-Jun-26, with QUERY added based on https://www.rfc-editor.org/rfc/rfc10008.html
     IANA_HTTP_METHODS = %w[
       ACL
       BASELINE-CONTROL
@@ -185,6 +185,7 @@ module Puma
       PROPFIND
       PROPPATCH
       PUT
+      QUERY
       REBIND
       REPORT
       SEARCH
@@ -235,6 +236,7 @@ module Puma
     PUMA_SOCKET = "puma.socket"
     PUMA_CONFIG = "puma.config"
     PUMA_PEERCERT = "puma.peercert"
+    PUMA_UNDERSCORE_HEADERS = "puma.underscore_headers"
 
     HTTP = "http"
     HTTPS = "https"
@@ -283,9 +285,8 @@ 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.
+    # Framing aliases must never be normalized into standard header keys.
+    # Client#setup_body rejects requests containing these keys before body reads.
     UNMASKABLE_HEADERS = {
       "HTTP_TRANSFER,ENCODING" => true,
       "HTTP_CONTENT,LENGTH" => true,
@@ -306,6 +307,7 @@ module Puma
       PIPE_TERM = "t"
       PIPE_PING = "p"
       PIPE_IDLE = "i"
+      PIPE_MOLD = "m"
     end
   end
 end