puma 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741e300011acfc59cbfd2bb93ebb04eaf5a438cd57f72acf6f9610c90fa3e9b6
-  data.tar.gz: bd7869f0cdc3f6c1de031a67c521ec56ca90cbdbaf0c9dea5d8d5c6b7179cff5
+  metadata.gz: 27238c0a5b2fe438167c0f56d89da2bded024ea017cdb903be3517cab2e826b6
+  data.tar.gz: d18f43c13332384208ea7e941e8ff01f6fdbd2ff74b36b978200737b4b8ac125
 SHA512:
-  metadata.gz: db333c1320593994d99eae71d8468c02f22d546715bd2d45635567fff8008aa42883e07111825add1f4648122029c64252ec92ffeb5ae59f0098d662f252921b
-  data.tar.gz: f1d9083523cedda162ab030009acc381dc277a8877d286154913239acb9de8ac804668852b64dd50fd0396e254eb0f58eed5ce8347bfdb6057d87bf835460e05
+  metadata.gz: 5381aede9f16b8bb80d8f45ce6c892ee337b1ce9528a9073bf3a0369bd86f475eab5e3c77e3f217e082939d2fdc680bed9fd44ff9e817b5c0d3bfd8ee74be810
+  data.tar.gz: 588e29319e59120aa21853ccd88e9ecec589cd488e6284e6fe8d036d363fa77e8bc5997e70f1d9d7b07ba02b9735bee70873bf7b1b454f07475aaa374ebd96af

data/History.md

@@ -1,4 +1,16 @@
-## 7.0.0
+## 7.0.2 / 2025-09-08
+
+* Bugfixes
+  * bug: control_cli.rb - Fixup `pumactl` code to load puma.rb for `deprecate_method_change` ([#3736], [#3734])
+  * Replace sleep spin lock with condition variable ([#3729])
+  * Fix Puma not booting if queue_requests disabled ([#3731])
+
+## 7.0.1 / 2025-09-06
+
+* Bugfixes
+  * Add backward compatibility aliases for Events class methods ([#3725])
+
+## 7.0.0 / 2025-09-03
 
 * Breaking changes
   * Set default `max_keep_alive` to 999 ([#3719])
@@ -30,7 +42,6 @@
   * Feature/support custom logger with request logs ([#3140])
 
 * Bugfixes
-  * Fixes a bug where triggering hooks in the ThreadPool fails ([#3716])
   * Fix error_logger inproperly logging `env[QUERY_STRING]` ([#3713], [#3625])
   * Fix handling of invalid Transfer-Encoding header errors ([#3702])
   * Fix socket leak on monitor wakeup `NoMethodError` in `Reactor#select_loop` ([#3696], [#3695])
@@ -2215,6 +2226,11 @@ be added back in a future date when a java Puma::MiniSSL is added.
 * Bugfixes
   * Your bugfix goes here <Most recent on the top, like GitHub> (#Github Number)
 
+[#3736]:https://github.com/puma/puma/pull/3736     "PR by @MSP-Greg, merged 2025-09-08"
+[#3734]:https://github.com/puma/puma/issues/3734   "Issue by @espen, closed 2025-09-08"
+[#3729]:https://github.com/puma/puma/pull/3729     "PR by @bensheldon, merged 2025-09-08"
+[#3731]:https://github.com/puma/puma/pull/3731     "PR by @stanhu, merged 2025-09-06"
+[#3725]:https://github.com/puma/puma/pull/3725     "PR by @tannakartikey, merged 2025-09-05"
 [#3719]:https://github.com/puma/puma/pull/3719     "PR by @schneems, merged 2025-09-03"
 [#3378]:https://github.com/puma/puma/pull/3378     "PR by @shayonj, merged 2025-08-19"
 [#3377]:https://github.com/puma/puma/pull/3377     "PR by @joshuay03, merged 2025-08-12"
@@ -2229,7 +2245,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#3101]:https://github.com/puma/puma/pull/3101     "PR by @ioquatix, merged 2025-08-25"
 [#3681]:https://github.com/puma/puma/pull/3681     "PR by @byroot, merged 2025-08-15"
 [#3140]:https://github.com/puma/puma/pull/3140     "PR by @phyzical, merged 2025-08-12"
-[#3716]:https://github.com/puma/puma/pull/3716     "PR by @yuki24, merged 2025-08-31"
 [#3713]:https://github.com/puma/puma/pull/3713     "PR by @MSP-Greg, merged 2025-08-29"
 [#3625]:https://github.com/puma/puma/pull/3625     "PR by @bhooshiek-narendiran, closed 2025-08-29"
 [#3702]:https://github.com/puma/puma/pull/3702     "PR by @marshall-lee, merged 2025-08-25"

data/lib/puma/cluster/worker_handle.rb

@@ -73,6 +73,8 @@ module Puma
         # check stat max values, we can't signal workers to reset the max values,
         # so we do so here
         WORKER_MAX_KEYS.each_with_index do |key, idx|
+          next unless hsh[key]
+
           if hsh[key] < @worker_max[idx]
             hsh[key] = @worker_max[idx]
           else

data/lib/puma/const.rb

@@ -100,7 +100,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "7.0.0"
+    PUMA_VERSION = VERSION = "7.0.2"
     CODE_NAME = "Romantic Warrior"
 
     PUMA_SERVER_STRING = ["puma", PUMA_VERSION, CODE_NAME].join(" ").freeze

data/lib/puma/control_cli.rb

@@ -124,6 +124,9 @@ module Puma
         end
 
         if @config_file
+          # needed because neither `Puma::CLI` or `Puma::Server` are loaded
+          require_relative '../puma'
+
           require_relative 'configuration'
           require_relative 'log_writer'
 

data/lib/puma/events.rb

@@ -42,6 +42,21 @@ module Puma
       register(:after_stopped, &block)
     end
 
+    def on_booted(&block)
+      Puma.deprecate_method_change :on_booted, __callee__, :after_booted
+      after_booted(&block)
+    end
+
+    def on_restart(&block)
+      Puma.deprecate_method_change :on_restart, __callee__, :before_restart
+      before_restart(&block)
+    end
+
+    def on_stopped(&block)
+      Puma.deprecate_method_change :on_stopped, __callee__, :after_stopped
+      after_stopped(&block)
+    end
+
     def fire_after_booted!
       fire(:after_booted)
     end

data/lib/puma/request.rb

@@ -273,11 +273,17 @@ module Puma
       !shutting_down? && keep_alive
     end
 
+    HTTP_ON_VALUES = { "on" => true, HTTPS => true }
+    private_constant :HTTP_ON_VALUES
+
     # @param env [Hash] see Puma::Client#env, from request
     # @return [Puma::Const::PORT_443,Puma::Const::PORT_80]
     #
     def default_server_port(env)
-      if ['on', HTTPS].include?(env[HTTPS_KEY]) || env[HTTP_X_FORWARDED_PROTO].to_s[0...5] == HTTPS || env[HTTP_X_FORWARDED_SCHEME] == HTTPS || env[HTTP_X_FORWARDED_SSL] == "on"
+      if HTTP_ON_VALUES[env[HTTPS_KEY]] ||
+          env[HTTP_X_FORWARDED_PROTO]&.start_with?(HTTPS) ||
+          env[HTTP_X_FORWARDED_SCHEME] == HTTPS ||
+          env[HTTP_X_FORWARDED_SSL] == "on"
         PORT_443
       else
         PORT_80

data/lib/puma/server.rb

@@ -382,7 +382,7 @@ module Puma
               else
                 # if ThreadPool out_of_band code is running, we don't want to add
                 # clients until the code is finished.
-                sleep 0.001 while pool.out_of_band_running
+                pool.wait_while_out_of_band_running
 
                 # only use delay when clustered and busy
                 if pool.busy_threads >= @max_threads
@@ -685,13 +685,13 @@ module Puma
       stats = @thread_pool&.stats || {}
       stats[:max_threads]    = @max_threads
       stats[:requests_count] = @requests_count
-      stats[:reactor_max] = @reactor.reactor_max
+      stats[:reactor_max] = @reactor.reactor_max if @reactor
       reset_max
       stats
     end
 
     def reset_max
-      @reactor.reactor_max = 0
+      @reactor.reactor_max = 0 if @reactor
       @thread_pool.reset_max
     end
 

data/lib/puma/thread_pool.rb

@@ -53,6 +53,7 @@ module Puma
       @block = block
       @out_of_band = options[:out_of_band]
       @out_of_band_running = false
+      @out_of_band_condvar = ConditionVariable.new
       @before_thread_start = options[:before_thread_start]
       @before_thread_exit = options[:before_thread_exit]
       @reaping_time = options[:reaping_time]
@@ -227,10 +228,19 @@ module Puma
       true
     ensure
       @out_of_band_running = false
+      @out_of_band_condvar.broadcast
     end
 
     private :trigger_out_of_band_hook
 
+    def wait_while_out_of_band_running
+      return unless @out_of_band_running
+
+      with_mutex do
+        @out_of_band_condvar.wait(@mutex) while @out_of_band_running
+      end
+    end
+
     # @version 5.0.0
     def with_mutex(&block)
       @mutex.owned? ?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Evan Phoenix
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Ruby/Rack web server built for parallelism.
 test_files: []