puma 6.6.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94e6b5d56525a92e2e279d59467572a254c7c03b9dc14a3e91ec5eba67b54620
-  data.tar.gz: 55e78ab10a5d222cce09dc89a92fbbd15d8e8ae7abbec95ca309e2903f68bd97
+  metadata.gz: 8e662aa9214837e2d08713550a828fe7ae8bdefe1eac79c9def581a6e089745b
+  data.tar.gz: 70dab329bbcf71e4ae4da042591eb8311de4c729e3c8d334d7c0ddc20bcf7aa4
 SHA512:
-  metadata.gz: 750f9ec059b9710eb5ae739dc04ad600fff8386a40dc3ef83500189caacf8b7413d01eb60d751befd1aa077f3565e60617d13ceba8b9a0c29912abf410b700ff
-  data.tar.gz: 1a56b1696333ae86e643bd045ebe83f6a1700ac5df948113a443326e867ce17bf3f4b7e05e01cda6b99605130a2b77ccf49d2ae153ad2e879971c7238d652548
+  metadata.gz: 379e3b2c89c03169805ec2c67e4ab43bb9af1a32d23a8f5f58dc0fc3d958ca34bdcc7390d656613357a5dbb86c1f8fa9b403d40e95cecb518a4c7b2415e65a05
+  data.tar.gz: 2981fa2d413989754a70c0c3a2df62a0efbcb8529b66cf78d6df917751d220bdd7b842ece6536ed789547b063b83498eb1c81bb37507e2289a8728929bfbcf34

data/History.md

@@ -1,3 +1,72 @@
+## 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])
+  * Increase `persistent_timeout` default to 65 seconds ([#3378])
+  * Raise an ArgumentError if no block given to hooks ([#3377])
+  * Don't set env['HTTP_VERSION'] for Rack > 3.1 ([#3711], [#3576])
+  * Runner.rb - remove `ruby_engine` method, deprecated Nov-2024 ([#3701])
+  * Set conditional config defaults after CLI options are parsed and config files are loaded ([#3297])
+  * Response headers set to lowercase ([#3704])
+  * Update minimum Ruby version to 3.0 ([#3698])
+  * Rename callback hooks ([#3438])
+
+| Old hook name| New hook name|
+|----------|----------|
+| on_worker_boot | before_worker_boot |
+| on_worker_shutdown | before_worker_shutdown |
+| on_restart | before_restart |
+| on_booted | after_booted |
+| on_stopped | after_stopped |
+| on_refork | before_refork |
+| on_thread_start | before_thread_start |
+| on_thread_exit | before_thread_exit |
+| on_worker_fork | before_worker_fork |
+
+* Features
+  * Fix long tail response problem with keepalive connections ([#3678]) (Previously released in 7.0.0.pre1, this was a high effort change)
+  * Introduce support for fiber-per-request. ([#3101])
+  * Add support for `rack.response_finished` ([#3681])
+  * Feature/support custom logger with request logs ([#3140])
+
+* Bugfixes
+  * 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])
+  * CI: puma_socket.rb fixup socket/request writes ([#3684])
+  * Warn when RUBY_MN_THREADS env var is set ([#3721])
+  * Improve the DSL `preload_app!` doc ([#3712])
+  * Fix the ability to focus individual tests ([#3705])
+  * Set env['rack.hijack'] to client.method(:full_hijack) ([#3073])
+
+* Performance
+  * server.rb - initialize ivars `@reactor` and `@env_set_http_version` ([#3714])
+
+* Refactor
+  * Simplify `Puma::DSL#process_hook` logic ([#3710])
+  * Dry up deprecation warnings and fix deprecation warnings when running CI. ([#3709], [#3708])
+  * Ensure and enforce that configs are loaded before options are accessed ([#3616])
+
+## 7.0.0.pre1 / 2025-07-31
+
+* Changed
+  * Fix long tail response problem with keepalive connections ([#3678])
+
+## 6.6.1 / 2025-07-30
+
+* Bugfixes
+  * Accept `to_path` to be `nil` on request bodies ([#3635])
+  * Fix single runner stats before the server start ([#3572])
+  * Fix incomplete worker boot state on refork ([#3601])
+  * Improve HttpParserError messages for better debugging ([#3586])
+  * Fix refork logs to distinguish from phased restarts ([#3598])
+  * Fix `rack.after_reply` so it doesn't interrupt chain on error ([#3680])
+
 ## 6.6.0 / 2025-01-29
 
 * Features
@@ -163,7 +232,7 @@
 
 * Features
   * Ability to supply a custom logger ([#2770], [#2511])
-  * Warn when clustered-only hooks are defined in single mode ([#3089])
+  * Warn when cluster mode-only hooks are defined in single mode ([#3089])
   * Adds the on_booted event ([#2709])
 
 * Bugfixes
@@ -758,7 +827,7 @@ Each patchlevel release contains a separate security fix. We recommend simply up
   * Fix Java 8 support ([#1773])
   * Fix error `uninitialized constant Puma::Cluster` ([#1731])
   * Fix `not_token` being able to be set to true ([#1803])
-  * Fix "Hang on SIGTERM with ruby 2.6 in clustered mode" (PR [#1741], [#1674], [#1720], [#1730], [#1755])
+  * Fix "Hang on SIGTERM with ruby 2.6 in cluster mode" (PR [#1741], [#1674], [#1720], [#1730], [#1755])
 
 ## 3.12.1 / 2019-03-19
 
@@ -1169,7 +1238,7 @@ Each patchlevel release contains a separate security fix. We recommend simply up
 * 4 minor features:
 
   * Listen to unix socket with provided backlog if any
-  * Improves the clustered stats to report worker stats
+  * Improves the cluster mode stats to report worker stats
   * Pass the env to the lowlevel_error handler. Fixes [#854]
   * Treat path-like hosts as unix sockets. Fixes [#824]
 
@@ -1896,7 +1965,7 @@ The "clearly I don't have enough tests for the config" release.
 
 * 3 doc changes:
   * Add note about on_worker_boot hook
-  * Add some documentation for Clustered mode
+  * Add some documentation for Cluster mode
   * Added quotes to /etc/puma.conf
 
 ## 2.0.1 / 2013-04-30
@@ -2150,6 +2219,42 @@ 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)
 
+[#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"
+[#3711]:https://github.com/puma/puma/pull/3711     "PR by @MSP-Greg, merged 2025-08-28"
+[#3576]:https://github.com/puma/puma/issues/3576   "Issue by @pdalberti, closed 2025-08-28"
+[#3701]:https://github.com/puma/puma/pull/3701     "PR by @MSP-Greg, merged 2025-08-26"
+[#3297]:https://github.com/puma/puma/pull/3297     "PR by @joshuay03, merged 2025-08-26"
+[#3704]:https://github.com/puma/puma/pull/3704     "PR by @schneems, merged 2025-08-25"
+[#3698]:https://github.com/puma/puma/pull/3698     "PR by @schneems, merged 2025-08-21"
+[#3438]:https://github.com/puma/puma/pull/3438     "PR by @tannakartikey, merged 2025-08-25"
+[#3678]:https://github.com/puma/puma/pull/3678     "PR by @MSP-Greg, merged 2025-07-31"
+[#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"
+[#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"
+[#3696]:https://github.com/puma/puma/pull/3696     "PR by @joshuay03, merged 2025-08-22"
+[#3695]:https://github.com/puma/puma/issues/3695   "Issue by @joshuay03, closed 2025-08-22"
+[#3684]:https://github.com/puma/puma/pull/3684     "PR by @MSP-Greg, merged 2025-08-02"
+[#3721]:https://github.com/puma/puma/pull/3721     "PR by @schneems, merged 2025-09-03"
+[#3712]:https://github.com/puma/puma/pull/3712     "PR by @joshuay03, merged 2025-08-28"
+[#3705]:https://github.com/puma/puma/pull/3705     "PR by @schneems, merged 2025-08-25"
+[#3073]:https://github.com/puma/puma/pull/3073     "PR by @MSP-Greg, merged 2025-08-12"
+[#3714]:https://github.com/puma/puma/pull/3714     "PR by @MSP-Greg, merged 2025-08-29"
+[#3710]:https://github.com/puma/puma/pull/3710     "PR by @joshuay03, merged 2025-08-28"
+[#3709]:https://github.com/puma/puma/pull/3709     "PR by @MSP-Greg, merged 2025-08-28"
+[#3708]:https://github.com/puma/puma/issues/3708   "Issue by @schneems, closed 2025-08-28"
+[#3616]:https://github.com/puma/puma/pull/3616     "PR by @joshuay03, merged 2025-08-25"
+[#3635]:https://github.com/puma/puma/pull/3635     "PR by @LevitatingBusinessMan, merged 2025-05-08"
+[#3572]:https://github.com/puma/puma/pull/3572     "PR by @barthez, merged 2025-02-06"
+[#3601]:https://github.com/puma/puma/pull/3601     "PR by @joshuay03, merged 2025-01-31"
+[#3586]:https://github.com/puma/puma/pull/3586     "PR by @MSP-Greg, merged 2025-02-03"
+[#3598]:https://github.com/puma/puma/pull/3598     "PR by @joshuay03, merged 2025-01-31"
+[#3680]:https://github.com/puma/puma/pull/3680     "PR by @byroot, merged 2025-07-31"
 [#3570]:https://github.com/puma/puma/pull/3570     "PR by @mohamedhafez, merged 2024-12-30"
 [#3567]:https://github.com/puma/puma/issues/3567   "Issue by @mohamedhafez, closed 2024-12-30"
 [#3383]:https://github.com/puma/puma/pull/3383     "PR by @joshuay03, merged 2024-11-29"
@@ -2748,7 +2853,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#1022]:https://github.com/puma/puma/issues/1022   "Issue by @AKovtunov, closed 2017-08-16"
 [#958]:https://github.com/puma/puma/issues/958     "Issue by @lalitlogical, closed 2016-04-23"
 [#782]:https://github.com/puma/puma/issues/782     "Issue by @Tonkpils, closed 2016-07-19"
-[#1010]:https://github.com/puma/puma/issues/1010   "Issue by @mneumark, closed 2016-07-19"
+[#1010]:https://github.com/puma/puma/issues/1010   "Issue by @mirineumark, closed 2016-07-19"
 [#959]:https://github.com/puma/puma/issues/959     "Issue by @mwpastore, closed 2016-04-22"
 [#840]:https://github.com/puma/puma/issues/840     "Issue by @marisawallace, closed 2016-04-07"
 [#1007]:https://github.com/puma/puma/pull/1007     "PR by @willnet, merged 2016-06-24"

data/README.md

@@ -4,7 +4,7 @@
 
 # Puma: A Ruby Web Server Built For Parallelism
 
-[![Actions](https://github.com/puma/puma/workflows/Tests/badge.svg?branch=master)](https://github.com/puma/puma/actions?query=workflow%3ATests)
+[![Actions](https://github.com/puma/puma/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/puma/puma/actions/workflows/tests.yml?query=branch%3Amaster)
 [![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
 [![StackOverflow](https://img.shields.io/badge/stackoverflow-Puma-blue.svg)]( https://stackoverflow.com/questions/tagged/puma )
 
@@ -102,9 +102,9 @@ Puma will automatically scale the number of threads, from the minimum until it c
 
 Be aware that additionally Puma creates threads on its own for internal purposes (e.g. handling slow clients). So, even if you specify -t 1:1, expect around 7 threads created in your application.
 
-### Clustered mode
+### Cluster mode
 
-Puma also offers "clustered mode". Clustered mode `fork`s workers from a master process. Each child process still has its own thread pool. You can tune the number of workers with the `-w` (or `--workers`) flag:
+Puma also offers "cluster mode". Cluster mode `fork`s workers from a master process. Each child process still has its own thread pool. You can tune the number of workers with the `-w` (or `--workers`) flag:
 
 ```
 $ puma -t 8:32 -w 3
@@ -116,15 +116,15 @@ Or with the `WEB_CONCURRENCY` environment variable:
 $ WEB_CONCURRENCY=3 puma -t 8:32
 ```
 
-Note that threads are still used in clustered mode, and the `-t` thread flag setting is per worker, so `-w 2 -t 16:16` will spawn 32 threads in total, with 16 in each worker process.
+Note that threads are still used in cluster mode, and the `-t` thread flag setting is per worker, so `-w 2 -t 16:16` will spawn 32 threads in total, with 16 in each worker process.
 
 If the `WEB_CONCURRENCY` environment variable is set to `"auto"` and the `concurrent-ruby` gem is available in your application, Puma will set the worker process count to the result of [available processors](https://ruby-concurrency.github.io/concurrent-ruby/master/Concurrent.html#available_processor_count-class_method).
 
 For an in-depth discussion of the tradeoffs of thread and process count settings, [see our docs](https://github.com/puma/puma/blob/9282a8efa5a0c48e39c60d22ca70051a25df9f55/docs/kubernetes.md#workers-per-pod-and-other-config-issues).
 
-In clustered mode, Puma can "preload" your application. This loads all the application code *prior* to forking. Preloading reduces total memory usage of your application via an operating system feature called [copy-on-write](https://en.wikipedia.org/wiki/Copy-on-write).
+In cluster mode, Puma can "preload" your application. This loads all the application code *prior* to forking. Preloading reduces total memory usage of your application via an operating system feature called [copy-on-write](https://en.wikipedia.org/wiki/Copy-on-write).
 
-If the `WEB_CONCURRENCY` environment variable is set to a value > 1 (and `--prune-bundler` has not been specified), preloading will be enabled by default. Otherwise, you can use the `--preload` flag from the command line:
+If the number of workers is greater than 1 (and `--prune-bundler` has not been specified), preloading will be enabled by default. Otherwise, you can use the `--preload` flag from the command line:
 
 ```
 $ puma -w 3 --preload
@@ -140,9 +140,9 @@ preload_app!
 
 Preloading can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and preloading copies the code of master into the workers.
 
-#### Clustered mode hooks
+#### Cluster mode hooks
 
-When using clustered mode, Puma's configuration DSL provides `before_fork` and `on_worker_boot`
+When using clustered mode, Puma's configuration DSL provides `before_fork` and `before_worker_boot`
 hooks to run code when the master process forks and child workers are booted respectively.
 
 It is recommended to use these hooks with `preload_app!`, otherwise constants loaded by your
@@ -154,16 +154,16 @@ before_fork do
   # Add code to run inside the Puma master process before it forks a worker child.
 end
 
-on_worker_boot do
+before_worker_boot do
   # Add code to run inside the Puma worker process after forking.
 end
 ```
 
-In addition, there is an `on_refork` and `after_refork` hooks which are used only in [`fork_worker` mode](docs/fork_worker.md),
+In addition, there is an `before_refork` and `after_refork` hooks which are used only in [`fork_worker` mode](docs/fork_worker.md),
 when the worker 0 child process forks a grandchild worker:
 
 ```ruby
-on_refork do
+before_refork do
   # Used only when fork_worker mode is enabled. Add code to run inside the Puma worker 0
   # child process before it forks a grandchild worker.
 end
@@ -176,7 +176,7 @@ after_refork do
 end
 ```
 
-Importantly, note the following considerations when Ruby forks a child process: 
+Importantly, note the following considerations when Ruby forks a child process:
 
 1. File descriptors such as network sockets **are** copied from the parent to the forked
    child process. Dual-use of the same sockets by parent and child will result in I/O conflicts
@@ -190,29 +190,29 @@ Therefore, we recommend the following:
 
 1. If possible, do not establish any socket connections (HTTP, database connections, etc.)
    inside Puma's master process when booting.
-2. If (1) is not possible, use `before_fork` and `on_refork` to disconnect the parent's socket
+2. If (1) is not possible, use `before_fork` and `before_refork` to disconnect the parent's socket
    connections when forking, so that they are not accidentally copied to the child process.
-3. Use `on_worker_boot` to restart any background threads on the forked child.
+3. Use `before_worker_boot` to restart any background threads on the forked child.
 4. Use `after_refork` to restart any background threads on the parent.
 
 #### Master process lifecycle hooks
 
-Puma's configuration DSL provides master process lifecycle hooks `on_booted`, `on_restart`, and `on_stopped`
+Puma's configuration DSL provides master process lifecycle hooks `after_booted`, `before_restart`, and `after_stopped`
 which may be used to specify code blocks to run on each event:
 
 ```ruby
 # config/puma.rb
-on_booted do
+after_booted do
   # Add code to run in the Puma master process after it boots,
   # and also after a phased restart completes.
 end
 
-on_restart do
+before_restart do
   # Add code to run in the Puma master process when it receives
   # a restart command but before it restarts.
 end
 
-on_stopped do
+after_stopped do
   # Add code to run in the Puma master process when it receives
   # a stop command but before it shuts down.
 end
@@ -432,19 +432,6 @@ Some platforms do not support all Puma features.
   * **Windows**: Cluster mode is not supported due to a lack of fork(2).
   * **Kubernetes**: The way Kubernetes handles pod shutdowns interacts poorly with server processes implementing graceful shutdown, like Puma. See the [kubernetes section of the documentation](docs/kubernetes.md) for more details.
 
-## Known Bugs
-
-For MRI versions 2.2.7, 2.2.8, 2.2.9, 2.2.10, 2.3.4 and 2.4.1, you may see ```stream closed in another thread (IOError)```. It may be caused by a [Ruby bug](https://bugs.ruby-lang.org/issues/13632). It can be fixed with the gem https://rubygems.org/gems/stopgap_13632:
-
-```ruby
-if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
-  begin
-    require 'stopgap_13632'
-  rescue LoadError
-  end
-end
-```
-
 ## Deployment
 
  * Puma has support for Capistrano with an [external gem](https://github.com/seuros/capistrano-puma).

data/docs/fork_worker.md

@@ -24,13 +24,13 @@ The `fork_worker` option allows your application to be initialized only once for
 
 ### Usage Considerations
 
-- `fork_worker` introduces new `on_refork` and `after_refork` configuration hooks. Note the following:
-    - When initially forking the parent process to the worker 0 child, `before_fork` will trigger on the parent process and `on_worker_boot` will trigger on the worker 0 child as normal.
-    - When forking the worker 0 child to grandchild workers, `on_refork` and `after_refork` will trigger on the worker 0 child, and `on_worker_boot` will trigger on each grandchild worker.
+- `fork_worker` introduces new `before_refork` and `after_refork` configuration hooks. Note the following:
+    - When initially forking the parent process to the worker 0 child, `before_fork` will trigger on the parent process and `before_worker_boot` will trigger on the worker 0 child as normal.
+    - When forking the worker 0 child to grandchild workers, `before_refork` and `after_refork` will trigger on the worker 0 child, and `before_worker_boot` will trigger on each grandchild worker.
     - For clarity, `before_fork` does not trigger on worker 0, and `after_refork` does not trigger on the grandchild.
 - As a general migration guide:
-    - Copy any logic within your existing `before_fork` hook to the `on_refork` hook.
-    - Consider to copy logic from your `on_worker_boot` hook to the `after_refork` hook, if it is needed to reset the state of worker 0 after it forks.
+    - Copy any logic within your existing `before_fork` hook to the `before_refork` hook.
+    - Consider to copy logic from your `before_worker_boot` hook to the `after_refork` hook, if it is needed to reset the state of worker 0 after it forks.
 
 ### Limitations
 

data/docs/kubernetes.md

@@ -8,10 +8,11 @@ In general running Puma in Kubernetes works as-is, no special configuration is n
 
 Assuming you already have a running cluster and docker image repository, you can run a simple Puma app with the following example Dockerfile and Deployment specification. These are meant as examples only and are deliberately very minimal to the point of skipping many options that are recommended for running in production, like healthchecks and envvar configuration with ConfigMaps. In general you should check the [Kubernetes documentation](https://kubernetes.io/docs/home/) and [Docker documentation](https://docs.docker.com/) for a more comprehensive overview of the available options.
 
-A basic Dockerfile example: 
+A basic Dockerfile example:
+
 ```
-FROM ruby:2.5.1-alpine # can be updated to newer ruby versions
-RUN apk update && apk add build-base # and any other packages you need 
+FROM ruby:3.4.5-alpine # can be updated to newer ruby versions
+RUN apk update && apk add build-base # and any other packages you need
 
 # Only rebuild gem bundle if Gemfile changes
 COPY Gemfile Gemfile.lock ./
@@ -26,6 +27,7 @@ CMD bundle exec rackup -o 0.0.0.0
 ```
 
 A sample `deployment.yaml`:
+
 ```
 ---
 apiVersion: apps/v1
@@ -47,7 +49,7 @@ spec:
         image: <your image here>
         ports:
         - containerPort: 9292
-``` 
+```
 
 ## Graceful shutdown and pod termination
 

data/docs/restart.md

@@ -29,7 +29,7 @@ Any of the following will cause a Puma server to perform a hot restart:
 
 * The newly started Puma process changes its current working directory to the directory specified by the `directory` option. If `directory` is set to symlink, this is automatically re-evaluated, so this mechanism can be used to upgrade the application.
 * Only one version of the application is running at a time.
-* `on_restart` is invoked just before the server shuts down. This can be used to clean up resources (like long-lived database connections) gracefully. Since Ruby 2.0, it is not typically necessary to explicitly close file descriptors on restart. This is because any file descriptor opened by Ruby will have the `FD_CLOEXEC` flag set, meaning that file descriptors are closed on `exec`. `on_restart` is useful, though, if your application needs to perform any more graceful protocol-specific shutdown procedures before closing connections.
+* `before_restart` is invoked just before the server shuts down. This can be used to clean up resources (like long-lived database connections) gracefully. Since Ruby 2.0, it is not typically necessary to explicitly close file descriptors on restart. This is because any file descriptor opened by Ruby will have the `FD_CLOEXEC` flag set, meaning that file descriptors are closed on `exec`. `before_restart` is useful, though, if your application needs to perform any more graceful protocol-specific shutdown procedures before closing connections.
 
 ## Phased restart
 
@@ -59,7 +59,7 @@ Any of the following will cause a Puma server to perform a phased restart:
 
 * When a phased restart begins, the Puma master process changes its current working directory to the directory specified by the `directory` option. If `directory` is set to symlink, this is automatically re-evaluated, so this mechanism can be used to upgrade the application.
 * On a single server, it's possible that two versions of the application are running concurrently during a phased restart.
-* `on_restart` is not invoked
+* `before_restart` is not invoked
 * Phased restarts can be slow for Puma clusters with many workers. Hot restarts often complete more quickly, but at the cost of increased latency during the restart.
 * Phased restarts cannot be used to upgrade any gems loaded by the Puma master process, including `puma` itself, anything in `extra_runtime_dependencies`, or dependencies thereof. Upgrading other gems is safe.
 * If you remove the gems from old releases as part of your deployment strategy, there are additional considerations. Do not put any gems into `extra_runtime_dependencies` that have native extensions or have dependencies that have native extensions (one common example is `puma_worker_killer` and its dependency on `ffi`). Workers will fail on boot during a phased restart. The underlying issue is recorded in [an issue on the rubygems project](https://github.com/rubygems/rubygems/issues/4004). Hot restarts are your only option here if you need these dependencies.

data/docs/signals.md

@@ -17,13 +17,13 @@ $ ps aux | grep tail
 schneems        87152   0.0  0.0  2432772    492 s032  S+   12:46PM   0:00.00 tail -f my.log
 ```
 
-You can send a signal in Ruby using the [Process module](https://ruby-doc.org/3.2.2/Process.html#method-c-kill):
+You can send a signal in Ruby using the [Process module](https://docs.ruby-lang.org/en/master/Process.html#method-c-kill):
 
 ```
 $ irb
 > puts pid
 => 87152
-Process.detach(pid) # https://ruby-doc.org/3.2.2/Process.html#method-c-detach
+Process.detach(pid) # https://docs.ruby-lang.org/en/master/Process.html#method-c-detach
 Process.kill("TERM", pid)
 ```
 
@@ -54,12 +54,12 @@ puma configuration file reloaded, if there is one
 puma configuration file reloaded, if there is one
 
 before_fork
-on_worker_fork
+before_worker_fork
 after_worker_fork
 
 Gemfile in context
 
-on_worker_boot
+before_worker_boot
 
 Code of the app is loaded and running
 ```
@@ -67,18 +67,18 @@ Code of the app is loaded and running
 ### Send USR2
 
 ```
-on_worker_shutdown
-on_restart
+before_worker_shutdown
+before_restart
 
 puma configuration file reloaded, if there is one
 
 before_fork
-on_worker_fork
+before_worker_fork
 after_worker_fork
 
 Gemfile in context
 
-on_worker_boot
+before_worker_boot
 
 Code of the app is loaded and running
 ```
@@ -86,13 +86,13 @@ Code of the app is loaded and running
 ### Send USR1
 
 ```
-on_worker_shutdown
-on_worker_fork
+before_worker_shutdown
+before_worker_fork
 after_worker_fork
 
 Gemfile in context
 
-on_worker_boot
+before_worker_boot
 
 Code of the app is loaded and running
 ```

data/docs/stats.md

@@ -65,7 +65,8 @@ When Puma runs in single mode, these stats are available at the top level. When
   and is not used for any internal decisions, unlike `busy_theads`, which is usually a more useful stat.
 * max_threads: the maximum number of threads Puma is configured to spool per worker
 * requests_count: the number of requests this worker has served since starting
-
+* reactor_max: the maximum observed number of requests held in Puma's "reactor" which is used for asyncronously buffering request bodies. This stat is reset on every call, so it's the maximum value observed since the last stat call.
+* backlog_max: the maximum number of requests that have been fully buffered by the reactor and placed in a ready queue, but have not yet been picked up by a server thread. This stat is reset on every call, so it's the maximum value observed since the last stat call.
 
 ### cluster mode
 

data/docs/systemd.md

@@ -72,7 +72,7 @@ systemd and Puma also support socket activation, where systemd opens the
 listening socket(s) in advance and provides them to the Puma master process on
 startup. Among other advantages, this keeps listening sockets open across puma
 restarts and achieves graceful restarts, including when upgraded Puma, and is
-compatible with both clustered mode and application preload.
+compatible with both cluster mode and application preload.
 
 **Note:** Any wrapper scripts which `exec`, or other indirections in `ExecStart`
 may result in activated socket file descriptors being closed before reaching the

data/ext/puma_http11/extconf.rb

@@ -52,29 +52,14 @@ unless ENV["PUMA_DISABLE_SSL"]
     have_func "SSL_get1_peer_certificate"              , ssl_h
 
     puts ''
-
-    # Random.bytes available in Ruby 2.5 and later, Random::DEFAULT deprecated in 3.0
-    if Random.respond_to?(:bytes)
-      $defs.push "-DHAVE_RANDOM_BYTES"
-      puts "checking for Random.bytes... yes"
-    else
-      puts "checking for Random.bytes... no"
-    end
   end
 end
 
 if ENV["PUMA_MAKE_WARNINGS_INTO_ERRORS"]
   # Make all warnings into errors
   # Except `implicit-fallthrough` since most failures comes from ragel state machine generated code
-  if respond_to?(:append_cflags, true) # Ruby 2.5 and later
-    append_cflags(config_string('WERRORFLAG') || '-Werror')
-    append_cflags '-Wno-implicit-fallthrough'
-  else
-    # flag may not exist on some platforms, -Werror may not be defined on some platforms, but
-    # works with all in current CI
-    $CFLAGS << " #{config_string('WERRORFLAG') || '-Werror'}"
-    $CFLAGS << ' -Wno-implicit-fallthrough'
-  end
+  append_cflags(config_string('WERRORFLAG') || '-Werror')
+  append_cflags '-Wno-implicit-fallthrough'
 end
 
 create_makefile("puma/puma_http11")

data/ext/puma_http11/mini_ssl.c

@@ -471,13 +471,8 @@ sslctx_initialize(VALUE self, VALUE mini_ssl_ctx) {
     SSL_CTX_set_verify(ctx, NUM2INT(verify_mode), engine_verify_callback);
   }
 
-  // Random.bytes available in Ruby 2.5 and later, Random::DEFAULT deprecated in 3.0
   session_id_bytes = rb_funcall(
-#ifdef HAVE_RANDOM_BYTES
     rb_cRandom,
-#else
-    rb_const_get(rb_cRandom, rb_intern_const("DEFAULT")),
-#endif
     rb_intern_const("bytes"),
     1, ULL2NUM(SSL_MAX_SSL_SESSION_ID_LENGTH));
 

data/ext/puma_http11/org/jruby/puma/Http11.java

@@ -29,7 +29,7 @@ public class Http11 extends RubyObject {
     public final static int MAX_REQUEST_URI_LENGTH = getConstLength("PUMA_REQUEST_URI_MAX_LENGTH", 1024 * 12);
     public final static String MAX_REQUEST_URI_LENGTH_ERR = "HTTP element REQUEST_URI is longer than the " + MAX_REQUEST_URI_LENGTH + " allowed length.";
     public final static int MAX_FRAGMENT_LENGTH = 1024;
-    public final static String MAX_FRAGMENT_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 1024 allowed length.";
+    public final static String MAX_FRAGMENT_LENGTH_ERR = "HTTP element FRAGMENT is longer than the 1024 allowed length.";
     public final static int MAX_REQUEST_PATH_LENGTH = getConstLength("PUMA_REQUEST_PATH_MAX_LENGTH", 8192);
     public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the " + MAX_REQUEST_PATH_LENGTH + " allowed length.";
     public final static int MAX_QUERY_STRING_LENGTH = getConstLength("PUMA_QUERY_STRING_MAX_LENGTH", 10 * 1024);

data/lib/puma/binder.rb

@@ -5,7 +5,6 @@ require 'socket'
 
 require_relative 'const'
 require_relative 'util'
-require_relative 'configuration'
 
 module Puma
 
@@ -19,9 +18,9 @@ module Puma
 
     RACK_VERSION = [1,6].freeze
 
-    def initialize(log_writer, conf = Configuration.new, env: ENV)
+    def initialize(log_writer, options, env: ENV)
       @log_writer = log_writer
-      @conf = conf
+      @options = options
       @listeners = []
       @inherited_fds = {}
       @activated_sockets = {}
@@ -31,10 +30,10 @@ module Puma
       @proto_env = {
         "rack.version".freeze => RACK_VERSION,
         "rack.errors".freeze => log_writer.stderr,
-        "rack.multithread".freeze => conf.options[:max_threads] > 1,
-        "rack.multiprocess".freeze => conf.options[:workers] >= 1,
+        "rack.multithread".freeze => options[:max_threads] > 1,
+        "rack.multiprocess".freeze => options[:workers] >= 1,
         "rack.run_once".freeze => false,
-        RACK_URL_SCHEME => conf.options[:rack_url_scheme],
+        RACK_URL_SCHEME => options[:rack_url_scheme],
         "SCRIPT_NAME".freeze => env['SCRIPT_NAME'] || "",
 
         # I'd like to set a default CONTENT_TYPE here but some things
@@ -44,7 +43,10 @@ module Puma
 
         "QUERY_STRING".freeze => "",
         SERVER_SOFTWARE => PUMA_SERVER_STRING,
-        GATEWAY_INTERFACE => CGI_VER
+        GATEWAY_INTERFACE => CGI_VER,
+
+        RACK_AFTER_REPLY => nil,
+        RACK_RESPONSE_FINISHED => nil,
       }
 
       @envs = {}
@@ -243,7 +245,7 @@ module Puma
               cert_key.each do |v|
                 if params[v]&.start_with?('store:')
                   index = Integer(params.delete(v).split('store:').last)
-                  params["#{v}_pem"] = @conf.options[:store][index]
+                  params["#{v}_pem"] = @options[:store][index]
                 end
               end
               MiniSSL::ContextBuilder.new(params, @log_writer).context

data/lib/puma/cli.rb

@@ -39,10 +39,8 @@ module Puma
       @control_url = nil
       @control_options = {}
 
-      setup_options env
-
       begin
-        @parser.parse! @argv
+        setup_options env
 
         if file = @argv.shift
           @conf.configure do |user_config, file_config|
@@ -93,7 +91,7 @@ module Puma
     #
 
     def setup_options(env = ENV)
-      @conf = Configuration.new({}, {events: @events}, env) do |user_config, file_config|
+      @conf = Configuration.new({}, { events: @events }, env) do |user_config, file_config|
         @parser = OptionParser.new do |o|
           o.on "-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)" do |arg|
             user_config.bind arg
@@ -240,7 +238,7 @@ module Puma
             $stdout.puts o
             exit 0
           end
-        end
+        end.parse! @argv
       end
     end
   end