puma 5.4.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8615fe84e162e127ef524e304e0cdc330d4f66b57fcd3339c9c32883fef73011
-  data.tar.gz: 505bf893eb69b1e910320dcb4769fe259cfa880e764900c8d1091b6f9baa7533
+  metadata.gz: b26655d47e2cc0987b78174ca6f6f7f9e16cfc584d1925cee08b2c4fd8d8a63e
+  data.tar.gz: 48aaec83462461d40fba5791679f8a81a677ea11731337d05213f358e1e1df01
 SHA512:
-  metadata.gz: 1c347073ca1dc41fb975cd0cfd19fecfa72780e11f08151caed06993b1045a0c2204911d77cbee967b332c68adc4940ad0c0f1f1b26cc105f1d3c923f3fee4f8
-  data.tar.gz: a67f6b4a6959b3f47deb0966e7c2a35697cc1021f77cc7598bdad080c60ef6705be39c0352da76c20bab5fd3165d1e207db8df0bad9ec4633dd5bbefdee3b39e
+  metadata.gz: e09ac76431f64ef08f5be4da5d2792e6ff7a152235534cc3c9a9798bf2bb34041fc98d6050b489598b1a9625bb9af13af355e3d4c9689cc055ab2790adbbcc8e
+  data.tar.gz: a2609c1568543ce1b41f51eff668e59ccacc79582c447fed74aeb334403e8f9212bb19f676ee2cd949f5209d240ab735495a5d364e549c4ab24676f1941801d5

data/History.md

@@ -1,3 +1,54 @@
+## 5.6.0 / 2022-01-25
+
+* Features
+  * Support `localhost` integration in `ssl_bind` ([#2764], [#2708])
+  * Allow backlog parameter to be set with ssl_bind DSL ([#2780])
+  * Remove yaml (psych) requirement in StateFile ([#2784])
+  * Allow culling of oldest workers, previously was only youngest ([#2773], [#2794])
+  * Add worker_check_interval configuration option ([#2759])
+  * Always send lowlevel_error response to client ([#2731], [#2341])
+  * Support for cert_pem and key_pem with ssl_bind DSL ([#2728])
+
+* Bugfixes
+  * Keep thread names under 15 characters, prevents breakage on some OSes ([#2733])
+  * Fix two 'old-style-definition' compile warning ([#2807], [#2806])
+  * Log environment correctly using option value ([#2799])
+  * Fix warning from Ruby master (will be 3.2.0) ([#2785])
+  * extconf.rb - fix openssl with old Windows builds ([#2757])
+  * server.rb - rescue handling (`Errno::EBADF`) for `@notify.close` ([#2745])
+
+* Refactor
+  * server.rb - refactor code using @options[:remote_address] ([#2742])
+  * [jruby] a couple refactorings - avoid copy-ing bytes ([#2730])
+
+## 5.5.2 / 2021-10-12
+
+* Bugfixes
+  * Allow UTF-8 in HTTP header values
+
+## 5.5.1 / 2021-10-12
+
+* Feature (added as mistake - we don't normally do this on bugfix releases, sorry!)
+  * Allow setting APP_ENV in preference to RACK_ENV or RAILS_ENV ([#2702])
+
+* Security
+  * Do not allow LF as a line ending in a header (CVE-2021-41136)
+
+## 5.5.0 / 2021-09-19
+
+* Features
+  * Automatic SSL certificate provisioning for localhost, via localhost gem ([#2610], [#2257])
+  * add support for the PROXY protocol (v1 only) ([#2654], [#2651])
+  * Add a semantic CLI option for no config file ([#2689])
+
+* Bugfixes
+  * More elaborate exception handling - lets some dead pumas die. ([#2700], [#2699])
+  * allow multiple after_worker_fork hooks ([#2690])
+  * Preserve BUNDLE_APP_CONFIG on worker fork ([#2688], [#2687])
+
+* Performance
+  * Fix performance of server-side SSL connection close. ([#2675])
+
 ## 5.4.0 / 2021-07-28
 
 * Features
@@ -9,6 +60,7 @@
   * `Binder#parse` - allow for symlinked unix path, add create_activated_fds debug ENV ([#2643], [#2638])
   * Fix deprecation warning: minissl.c - Use Random.bytes if available ([#2642])
   * Client certificates: set session id context while creating SSLContext ([#2633])
+  * Fix deadlock issue in thread pool ([#2656])
 
 * Refactor
   * Replace `IO.select` with `IO#wait_*` when checking a single IO ([#2666])
@@ -235,6 +287,16 @@
   * Support parallel tests in verbose progress reporting ([#2223])
   * Refactor error handling in server accept loop ([#2239])
 
+## 4.3.10 / 2021-10-12
+
+* Bugfixes
+  * Allow UTF-8 in HTTP header values
+
+## 4.3.9 / 2021-10-12
+
+* Security
+  * Do not allow LF as a line ending in a header (CVE-2021-41136)
+
 ## 4.3.8 / 2021-05-11
 
 * Security
@@ -1768,6 +1830,37 @@ 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)
 
+[#2764]:https://github.com/puma/puma/pull/2764     "PR by @dentarg, merged 2022-01-18"
+[#2708]:https://github.com/puma/puma/issues/2708   "Issue by @erikaxel, closed 2022-01-18"
+[#2780]:https://github.com/puma/puma/pull/2780     "PR by @dalibor, merged 2022-01-01"
+[#2784]:https://github.com/puma/puma/pull/2784     "PR by @MSP-Greg, merged 2022-01-01"
+[#2773]:https://github.com/puma/puma/pull/2773     "PR by @ob-stripe, merged 2022-01-01"
+[#2794]:https://github.com/puma/puma/pull/2794     "PR by @johnnyshields, merged 2022-01-10"
+[#2759]:https://github.com/puma/puma/pull/2759     "PR by @ob-stripe, merged 2021-12-11"
+[#2731]:https://github.com/puma/puma/pull/2731     "PR by @baelter, merged 2021-11-02"
+[#2341]:https://github.com/puma/puma/issues/2341   "Issue by @cjlarose, closed 2021-11-02"
+[#2728]:https://github.com/puma/puma/pull/2728     "PR by @dalibor, merged 2021-10-31"
+[#2733]:https://github.com/puma/puma/pull/2733     "PR by @ob-stripe, merged 2021-12-12"
+[#2807]:https://github.com/puma/puma/pull/2807     "PR by @MSP-Greg, merged 2022-01-25"
+[#2806]:https://github.com/puma/puma/issues/2806   "Issue by @olleolleolle, closed 2022-01-25"
+[#2799]:https://github.com/puma/puma/pull/2799     "PR by @ags, merged 2022-01-22"
+[#2785]:https://github.com/puma/puma/pull/2785     "PR by @MSP-Greg, merged 2022-01-02"
+[#2757]:https://github.com/puma/puma/pull/2757     "PR by @MSP-Greg, merged 2021-11-24"
+[#2745]:https://github.com/puma/puma/pull/2745     "PR by @MSP-Greg, merged 2021-11-03"
+[#2742]:https://github.com/puma/puma/pull/2742     "PR by @MSP-Greg, merged 2021-12-12"
+[#2730]:https://github.com/puma/puma/pull/2730     "PR by @kares, merged 2021-11-01"
+[#2702]:https://github.com/puma/puma/pull/2702     "PR by @jacobherrington, merged 2021-09-21"
+[#2610]:https://github.com/puma/puma/pull/2610     "PR by @ye-lin-aung, merged 2021-08-18"
+[#2257]:https://github.com/puma/puma/issues/2257   "Issue by @nateberkopec, closed 2021-08-18"
+[#2654]:https://github.com/puma/puma/pull/2654     "PR by @Roguelazer, merged 2021-09-07"
+[#2651]:https://github.com/puma/puma/issues/2651   "Issue by @Roguelazer, closed 2021-09-07"
+[#2689]:https://github.com/puma/puma/pull/2689     "PR by @jacobherrington, merged 2021-09-05"
+[#2700]:https://github.com/puma/puma/pull/2700     "PR by @ioquatix, merged 2021-09-16"
+[#2699]:https://github.com/puma/puma/issues/2699   "Issue by @ioquatix, closed 2021-09-16"
+[#2690]:https://github.com/puma/puma/pull/2690     "PR by @doits, merged 2021-09-06"
+[#2688]:https://github.com/puma/puma/pull/2688     "PR by @jdelStrother, merged 2021-09-03"
+[#2687]:https://github.com/puma/puma/issues/2687   "Issue by @jdelStrother, closed 2021-09-03"
+[#2675]:https://github.com/puma/puma/pull/2675     "PR by @devwout, merged 2021-09-08"
 [#2657]:https://github.com/puma/puma/pull/2657     "PR by @olivierbellone, merged 2021-07-13"
 [#2648]:https://github.com/puma/puma/pull/2648     "PR by @MSP-Greg, merged 2021-06-27"
 [#1412]:https://github.com/puma/puma/issues/1412   "Issue by @x-yuri, closed 2021-06-27"
@@ -1777,6 +1870,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2638]:https://github.com/puma/puma/issues/2638   "Issue by @gingerlime, closed 2021-06-27"
 [#2642]:https://github.com/puma/puma/pull/2642     "PR by @MSP-Greg, merged 2021-06-16"
 [#2633]:https://github.com/puma/puma/pull/2633     "PR by @onlined, merged 2021-06-04"
+[#2656]:https://github.com/puma/puma/pull/2656     "PR by @olivierbellone, merged 2021-07-07"
 [#2666]:https://github.com/puma/puma/pull/2666     "PR by @MSP-Greg, merged 2021-07-25"
 [#2630]:https://github.com/puma/puma/pull/2630     "PR by @seangoedecke, merged 2021-05-20"
 [#2626]:https://github.com/puma/puma/issues/2626   "Issue by @rorymckinley, closed 2021-05-20"
@@ -1800,8 +1894,8 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2552]:https://github.com/puma/puma/issues/2552   "Issue by @feliperaul, closed 2021-05-24"
 [#2606]:https://github.com/puma/puma/pull/2606     "PR by @wjordan, merged 2021-04-20"
 [#2574]:https://github.com/puma/puma/issues/2574   "Issue by @darkhelmet, closed 2021-04-20"
-[#2567]:https://github.com/puma/puma/pull/2567     "PR by @kddeisz, merged 2021-04-19"
-[#2566]:https://github.com/puma/puma/issues/2566   "Issue by @kddeisz, closed 2021-04-19"
+[#2567]:https://github.com/puma/puma/pull/2567     "PR by @kddnewton, merged 2021-04-19"
+[#2566]:https://github.com/puma/puma/issues/2566   "Issue by @kddnewton, closed 2021-04-19"
 [#2596]:https://github.com/puma/puma/pull/2596     "PR by @MSP-Greg, merged 2021-04-18"
 [#2588]:https://github.com/puma/puma/pull/2588     "PR by @dentarg, merged 2021-04-02"
 [#2556]:https://github.com/puma/puma/issues/2556   "Issue by @gamecreature, closed 2021-04-02"

data/README.md

@@ -2,7 +2,7 @@
   <img src="https://puma.io/images/logos/puma-logo-large.png">
 </p>
 
-# Puma: A Ruby Web Server Built For Concurrency
+# Puma: A Ruby Web Server Built For Parallelism
 
 [![Actions MRI](https://github.com/puma/puma/workflows/MRI/badge.svg?branch=master)](https://github.com/puma/puma/actions?query=workflow%3AMRI)
 [![Actions non MRI](https://github.com/puma/puma/workflows/non_MRI/badge.svg?branch=master)](https://github.com/puma/puma/actions?query=workflow%3Anon_MRI)
@@ -10,11 +10,11 @@
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=puma&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=puma&package-manager=bundler&version-scheme=semver)
 [![StackOverflow](https://img.shields.io/badge/stackoverflow-Puma-blue.svg)]( https://stackoverflow.com/questions/tagged/puma )
 
-Puma is a **simple, fast, multi-threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications**.
+Puma is a **simple, fast, multi-threaded, and highly parallel HTTP 1.1 server for Ruby/Rack applications**.
 
-## Built For Speed &amp; Concurrency
+## Built For Speed &amp; Parallelism
 
-Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request using a thread pool. Each request is served in a separate thread, so truly concurrent Ruby implementations (JRuby, Rubinius) will use all available CPU cores.
+Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request using a thread pool. Each request is served in a separate thread, so truly parallel Ruby implementations (JRuby, Rubinius) will use all available CPU cores.
 
 Originally designed as a server for [Rubinius](https://github.com/rubinius/rubinius), Puma also works well with Ruby (MRI) and JRuby.
 
@@ -137,6 +137,11 @@ This code can be used to setup the process before booting the application, allow
 you to do some Puma-specific things that you don't want to embed in your application.
 For instance, you could fire a log notification that a worker booted or send something to statsd. This can be called multiple times.
 
+Constants loaded by your application (such as `Rails`) will not be available in `on_worker_boot`.
+However, these constants _will_ be available if `preload_app!` is enabled, either explicitly in your `puma` config or automatically if
+using 2 or more workers in cluster mode.
+If `preload_app!` is not enabled and 1 worker is used, then `on_worker_boot` will fire, but your app will not be preloaded and constants will not be available.
+
 `before_fork` specifies a block to be run before workers are forked:
 
 ```ruby
@@ -187,6 +192,38 @@ Need a bit of security? Use SSL sockets:
 ```
 $ puma -b 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'
 ```
+#### Self-signed SSL certificates (via the [`localhost`] gem, for development use): 
+
+Puma supports the [`localhost`] gem for self-signed certificates. This is particularly useful if you want to use Puma with SSL locally, and self-signed certificates will work for your use-case. Currently, the integration can only be used in MRI. 
+
+Puma automatically configures SSL when the [`localhost`] gem is loaded in a `development` environment:
+
+```ruby
+# Add the gem to your Gemfile
+group(:development) do 
+  gem 'localhost'
+end
+
+# And require it implicitly using bundler
+require "bundler"
+Bundler.require(:default, ENV["RACK_ENV"].to_sym)
+
+# Alternatively, you can require the gem in config.ru:
+require './app'
+require 'localhost'
+run Sinatra::Application
+```
+
+Additionally, Puma must be listening to an SSL socket:
+
+```shell
+$ puma -b 'ssl://localhost:9292' config.ru
+
+# The following options allow you to reach Puma over HTTP as well:
+$ puma -b ssl://localhost:9292 -b tcp://localhost:9393 config.ru
+```
+
+[`localhost`]: https://github.com/socketry/localhost
 
 #### Controlling SSL Cipher Suites
 
@@ -255,11 +292,15 @@ You can also provide a configuration file with the `-C` (or `--config`) flag:
 $ puma -C /path/to/config
 ```
 
-If no configuration file is specified, Puma will look for a configuration file at `config/puma.rb`. If an environment is specified, either via the `-e` and `--environment` flags, or through the `RACK_ENV` or the `RAILS_ENV` environment variables, Puma first looks for configuration at `config/puma/<environment_name>.rb`, and then falls back to `config/puma.rb`.
+If no configuration file is specified, Puma will look for a configuration file at `config/puma.rb`. If an environment is specified (via the `--environment` flag or through the `APP_ENV`, `RACK_ENV`, or `RAILS_ENV` environment variables) Puma looks for a configuration file at `config/puma/<environment_name>.rb` and then falls back to `config/puma.rb`.
 
-If you want to prevent Puma from looking for a configuration file in those locations, provide a dash as the argument to the `-C` (or `--config`) flag:
+If you want to prevent Puma from looking for a configuration file in those locations, include the `--no-config` flag:
 
 ```
+$ puma --no-config
+
+# or
+
 $ puma -C "-"
 ```
 

data/docs/architecture.md

@@ -4,38 +4,71 @@
 
 ![https://bit.ly/2iJuFky](images/puma-general-arch.png)
 
-Puma is a threaded Ruby HTTP application server, processing requests across a TCP or UNIX socket.
+Puma is a threaded Ruby HTTP application server processing requests across a TCP
+and/or UNIX socket.
 
 
-Puma processes (there can be one or many) accept connections from the socket via a thread (in the [`Reactor`](../lib/puma/reactor.rb) class). The connection, once fully buffered and read, moves in to the `todo` list, where it will be picked up by a free/waiting thread in the threadpool (the [`ThreadPool`](../lib/puma/thread_pool.rb) class).
+Puma processes (there can be one or many) accept connections from the socket via
+a thread (in the [`Reactor`](../lib/puma/reactor.rb) class). The connection,
+once fully buffered and read, moves into the `todo` list, where an available
+thread will pick it up (in the [`ThreadPool`](../lib/puma/thread_pool.rb)
+class).
 
-Puma works in two main modes: cluster and single. In single mode, only one Puma process is booted. In cluster mode, a `master` process is booted, which prepares (and may boot) the application, and then uses the `fork()` system call to create 1 or more `child` processes. These `child` processes all listen to the same socket. The `master` process does not listen to the socket or process requests - its purpose is mostly to manage and listen for UNIX signals and possibly kill or boot `child` processes.
+Puma works in two main modes: cluster and single. In single mode, only one Puma
+process boots. In cluster mode, a `master` process is booted, which prepares
+(and may boot) the application and then uses the `fork()` system call to create
+one or more `child` processes. These `child` processes all listen to the same
+socket. The `master` process does not listen to the socket or process requests -
+its purpose is primarily to manage and listen for UNIX signals and possibly kill
+or boot `child` processes.
 
-We sometimes call `child` processes (or Puma processes in `single` mode) _workers_, and we sometimes call the threads created by Puma's [`ThreadPool`](../lib/puma/thread_pool.rb)  _worker threads_.
+We sometimes call `child` processes (or Puma processes in `single` mode)
+_workers_, and we sometimes call the threads created by Puma's
+[`ThreadPool`](../lib/puma/thread_pool.rb) _worker threads_.
 
 ## How Requests Work
 
 ![https://bit.ly/2zwzhEK](images/puma-connection-flow.png)
 
 * Upon startup, Puma listens on a TCP or UNIX socket.
-  * The backlog of this socket is configured (with a default of 1024). This determines the size of the queue for unaccepted connections. Generally, this setting is unimportant and will never be hit in production use. If the backlog is full, the connection will be refused by the operating system.
-  * This socket backlog is distinct from the `backlog` of work as reported by `Puma.stats` or the control server. The backlog as reported by Puma is the number of connections in the process' `todo` set waiting for a thread from the [`ThreadPool`](../lib/puma/thread_pool.rb).
-* By default, a single, separate thread (created by the [`Reactor`](../lib/puma/reactor.rb) class) is used to read and buffer requests from the socket.
-  * When at least one worker thread is available for work, the reactor thread listens to the socket and accepts a request, if one is waiting.
+  * The backlog of this socket is configured with a default of 1024, but the
+    actual backlog value is capped by the `net.core.somaxconn` sysctl value.
+    The backlog determines the size of the queue for unaccepted connections. If
+    the backlog is full, the operating system is not accepting new connections.
+  * This socket backlog is distinct from the `backlog` of work as reported by
+    `Puma.stats` or the control server. The backlog that `Puma.stats` refers to
+    represents the number of connections in the process' `todo` set waiting for
+    a thread from the [`ThreadPool`](../lib/puma/thread_pool.rb).
+* By default, a single, separate thread (created by the
+  [`Reactor`](../lib/puma/reactor.rb) class) reads and buffers requests from the
+  socket.
+  * When at least one worker thread is available for work, the reactor thread
+    listens to the socket and accepts a request (if one is waiting).
   * The reactor thread waits for the entire HTTP request to be received.
-    * The time spent waiting for the HTTP request body to be received is exposed to the Rack app as `env['puma.request_body_wait']` (milliseconds).
-  * Once fully buffered and received, the connection is pushed into the "todo" set.
+    * Puma exposes the time spent waiting for the HTTP request body to be
+      received to the Rack app as `env['puma.request_body_wait']`
+      (milliseconds).
+  * Once fully buffered and received, the connection is pushed into the "todo"
+    set.
 * Worker threads pop work off the "todo" set for processing.
-  * The worker thread processes the request via `call`ing the configured Rack application. The Rack application generates the HTTP response.
-  * The worker thread writes the response to the connection. Note that while Puma buffers requests via a separate thread, it does not use a separate thread for responses.
-  * Once done, the thread become available to process another connection in the "todo" set.
+  * The worker thread processes the request via `call`ing the configured Rack
+    application. The Rack application generates the HTTP response.
+  * The worker thread writes the response to the connection. While Puma buffers
+    requests via a separate thread, it does not use a separate thread for
+    responses.
+  * Once done, the thread becomes available to process another connection in the
+    "todo" set.
 
 ### `queue_requests`
 
 ![https://bit.ly/2zxCJ1Z](images/puma-connection-flow-no-reactor.png)
 
-The `queue_requests` option is `true` by default, enabling the separate reactor thread used to buffer requests as described above.
+The `queue_requests` option is `true` by default, enabling the separate reactor
+thread used to buffer requests as described above.
 
-If set to `false`, this buffer will not be used for connections while waiting for the request to arrive.
+If set to `false`, this buffer will not be used for connections while waiting
+for the request to arrive.
 
-In this mode, when a connection is accepted, it is added to the "todo" queue immediately, and a worker will synchronously do any waiting necessary to read the HTTP request from the socket.
+In this mode, when a connection is accepted, it is added to the "todo" queue
+immediately, and a worker will synchronously do any waiting necessary to read
+the HTTP request from the socket.

data/docs/compile_options.md

@@ -1,10 +1,12 @@
 # Compile Options
 
-There are some `cflags` provided to change Puma's default configuration for its C extension.
+There are some `cflags` provided to change Puma's default configuration for its
+C extension.
 
 ## Query String, `PUMA_QUERY_STRING_MAX_LENGTH`
 
-By default, the max length of `QUERY_STRING` is `1024 * 10`. But you may want to adjust it to allow accept larger queries in GET requests.
+By default, the max length of `QUERY_STRING` is `1024 * 10`. But you may want to
+adjust it to accept longer queries in GET requests.
 
 For manual install, pass the `PUMA_QUERY_STRING_MAX_LENGTH` option like this:
 

data/docs/deployment.md

@@ -1,35 +1,32 @@
 # Deployment engineering for Puma
 
-Puma is software that is expected to be run in a deployed environment eventually.
-You can certainly use it as your dev server only, but most people look to use
-it in their production deployments as well.
+Puma expects to be run in a deployed environment eventually. You can use it as
+your development server, but most people use it in their production deployments.
 
-To that end, this is meant to serve as a foundation of wisdom how to do that
-in a way that increases happiness and decreases downtime.
+To that end, this document serves as a foundation of wisdom regarding deploying
+Puma to production while increasing happiness and decreasing downtime.
 
 ## Specifying Puma
 
-Most people want to do this by putting `gem "puma"` into their Gemfile, so we'll
-go ahead and assume that. Go add it now... we'll wait.
+Most people will specify Puma by including `gem "puma"` in a Gemfile, so we'll
+assume this is how you're using Puma.
 
-Welcome back!
+## Single vs. Cluster mode
 
-## Single vs Cluster mode
+Initially, Puma was conceived as a thread-only web server, but support for
+processes was added in version 2.
 
-Puma was originally conceived as a thread-only web server, but grew the ability to
-also use processes in version 2.
+To run `puma` in single mode (i.e., as a development environment), set the
+number of workers to 0; anything higher will run in cluster mode.
 
-To run `puma` in single mode (e.g. for a development environment) you will need to
-set the number of workers to 0, anything above will run in cluster mode.
-
-Here are some rules of thumb for cluster mode:
+Here are some tips for cluster mode:
 
 ### MRI
 
-* Use cluster mode and set the number of workers to 1.5x the number of cpu cores
-  in the machine, minimum 2.
-* Set the number of threads to desired concurrent requests / number of workers.
-  Puma defaults to 5 and that's a decent number.
+* Use cluster mode and set the number of workers to 1.5x the number of CPU cores
+  in the machine, starting from a minimum of 2.
+* Set the number of threads to desired concurrent requests/number of workers.
+  Puma defaults to 5, and that's a decent number.
 
 #### Migrating from Unicorn
 
@@ -37,7 +34,7 @@ Here are some rules of thumb for cluster mode:
   * Set workers to half the number of unicorn workers you're using
   * Set threads to 2
   * Enjoy 50% memory savings
-* As you grow more confident in the thread safety of your app, you can tune the
+* As you grow more confident in the thread-safety of your app, you can tune the
   workers down and the threads up.
 
 #### Ubuntu / Systemd (Systemctl) Installation
@@ -48,54 +45,58 @@ See [systemd.md](systemd.md)
 
 **How do you know if you've got enough (or too many workers)?**
 
-A good question. Due to MRI's GIL, only one thread can be executing Ruby code at a time.
-But since so many apps are waiting on IO from DBs, etc., they can utilize threads
-to make better use of the process.
+A good question. Due to MRI's GIL, only one thread can be executing Ruby code at
+a time. But since so many apps are waiting on IO from DBs, etc., they can
+utilize threads to use the process more efficiently.
 
-The rule of thumb is you never want processes that are pegged all the time. This
-means that there is more work to do than the process can get through. On the other
-hand, if you have processes that sit around doing nothing, then they're just eating
-up resources.
+Generally, you never want processes that are pegged all the time. That can mean
+there is more work to do than the process can get through. On the other hand, if
+you have processes that sit around doing nothing, then they're just eating up
+resources.
 
-Watch your CPU utilization over time and aim for about 70% on average. This means
-you've got capacity still but aren't starving threads.
+Watch your CPU utilization over time and aim for about 70% on average. 70%
+utilization means you've got capacity still but aren't starving threads.
 
 **Measuring utilization**
 
-Using a timestamp header from an upstream proxy server (eg. nginx or haproxy), it's
-possible to get an indication of how long requests have been waiting for a Puma
-thread to become available.
+Using a timestamp header from an upstream proxy server (e.g., `nginx` or
+`haproxy`) makes it possible to indicate how long requests have been waiting for
+a Puma thread to become available.
 
 * Have your upstream proxy set a header with the time it received the request:
     * nginx: `proxy_set_header X-Request-Start "${msec}";`
-    * haproxy >= 1.9: `http-request set-header X-Request-Start t=%[date()]%[date_us()]`
+    * haproxy >= 1.9: `http-request set-header X-Request-Start
+      t=%[date()]%[date_us()]`
     * haproxy < 1.9: `http-request set-header X-Request-Start t=%[date()]`
-* In your Rack middleware, determine the amount of time elapsed since `X-Request-Start`.
-* To improve accuracy, you will want to subtract time spent waiting for slow clients:
-    * `env['puma.request_body_wait']` contains the number of milliseconds Puma spent
-      waiting for the client to send the request body.
-    * haproxy: `%Th` (TLS handshake time) and `%Ti` (idle time before request) can
-      can also be added as headers.
+* In your Rack middleware, determine the amount of time elapsed since
+  `X-Request-Start`.
+* To improve accuracy, you will want to subtract time spent waiting for slow
+  clients:
+    * `env['puma.request_body_wait']` contains the number of milliseconds Puma
+      spent waiting for the client to send the request body.
+    * haproxy: `%Th` (TLS handshake time) and `%Ti` (idle time before request)
+      can can also be added as headers.
 
 ## Should I daemonize?
 
-Daemonization was removed in Puma 5.0. For alternatives, continue reading.
+The Puma 5.0 release removed daemonization. For older versions and alternatives,
+continue reading.
 
-I prefer to not daemonize my servers and use something like `runit` or `systemd` to
-monitor them as child processes. This gives them fast response to crashes and
+I prefer not to daemonize my servers and use something like `runit` or `systemd`
+to monitor them as child processes. This gives them fast response to crashes and
 makes it easy to figure out what is going on. Additionally, unlike `unicorn`,
-puma does not require daemonization to do zero-downtime restarts.
+Puma does not require daemonization to do zero-downtime restarts.
 
-I see people using daemonization because they start puma directly via capistrano
-task and thus want it to live on past the `cap deploy`. To these people I say:
-You need to be using a process monitor. Nothing is making sure puma stays up in
-this scenario! You're just waiting for something weird to happen, puma to die,
-and to get paged at 3am. Do yourself a favor, at least the process monitoring
-your OS comes with, be it `sysvinit` or `systemd`. Or branch out
-and use `runit` or hell, even `monit`.
+I see people using daemonization because they start puma directly via Capistrano
+task and thus want it to live on past the `cap deploy`. To these people, I say:
+You need to be using a process monitor. Nothing is making sure Puma stays up in
+this scenario! You're just waiting for something weird to happen, Puma to die,
+and to get paged at 3 AM. Do yourself a favor, at least the process monitoring
+your OS comes with, be it `sysvinit` or `systemd`. Or branch out and use `runit`
+or hell, even `monit`.
 
 ## Restarting
 
 You probably will want to deploy some new code at some point, and you'd like
-puma to start running that new code. There are a few options for restarting
-puma, described separately in our [restart documentation](restart.md).
+Puma to start running that new code. There are a few options for restarting
+Puma, described separately in our [restart documentation](restart.md).

data/docs/plugins.md

@@ -3,22 +3,22 @@
 Puma 3.0 added support for plugins that can augment configuration and service
 operations.
 
-2 canonical plugins to look to aid in development of further plugins:
+There are two canonical plugins to aid in the development of new plugins:
 
 * [tmp\_restart](https://github.com/puma/puma/blob/master/lib/puma/plugin/tmp_restart.rb):
   Restarts the server if the file `tmp/restart.txt` is touched
 * [heroku](https://github.com/puma/puma-heroku/blob/master/lib/puma/plugin/heroku.rb):
-  Packages up the default configuration used by puma on Heroku (being sunset with the release of Puma 5.0)
+  Packages up the default configuration used by Puma on Heroku (being sunset
+  with the release of Puma 5.0)
 
-Plugins are activated in a puma configuration file (such as `config/puma.rb'`)
+Plugins are activated in a Puma configuration file (such as `config/puma.rb'`)
 by adding `plugin "name"`, such as `plugin "heroku"`.
 
-Plugins are activated based simply on path requirements so, activating the
-`heroku` plugin will simply be doing `require "puma/plugin/heroku"`. This
-allows gems to provide multiple plugins (as well as unrelated gems to provide
-puma plugins).
+Plugins are activated based on path requirements so, activating the `heroku`
+plugin is much like `require "puma/plugin/heroku"`. This allows gems to provide
+multiple plugins (as well as unrelated gems to provide Puma plugins).
 
-The `tmp_restart` plugin is bundled with puma, so it can always be used.
+The `tmp_restart` plugin comes with Puma, so it is always available.
 
 To use the `heroku` plugin, add `puma-heroku` to your Gemfile or install it.
 
@@ -26,13 +26,13 @@ To use the `heroku` plugin, add `puma-heroku` to your Gemfile or install it.
 
 ## Server-wide hooks
 
-Plugins can use a couple of hooks at server level: `start` and `config`.
+Plugins can use a couple of hooks at the server level: `start` and `config`.
 
-`start` runs when the server has started and allows the plugin to start other
-functionality to augment puma.
+`start` runs when the server has started and allows the plugin to initiate other
+functionality to augment Puma.
 
-`config` runs when the server is being configured and is passed a `Puma::DSL`
-object that can be used to add additional configuration.
+`config` runs when the server is being configured and receives a `Puma::DSL`
+object that is useful for additional configuration.
 
-Any public methods in [`Puma::Plugin`](../lib/puma/plugin.rb) are the public API that any plugin may
-use.
+Public methods in [`Puma::Plugin`](../lib/puma/plugin.rb) are treated as a
+public API for plugins.

data/docs/rails_dev_mode.md

@@ -2,16 +2,15 @@
 
 ## "Loopback requests" 
 
-Be cautious of "loopback requests", where a Rails application executes a request to a server that in turn, results in another request back to the same Rails application before the first request is completed. Having a loopback request will trigger [Rails' load interlock](https://guides.rubyonrails.org/threading_and_code_execution.html#load-interlock) mechanism. The load interlock mechanism prevents a thread from using Rails autoloading mechanism to load constants while the application code is still running inside another thread.
+Be cautious of "loopback requests," where a Rails application executes a request to a server that, in turn, results in another request back to the same Rails application before the first request completes. Having a loopback request will trigger [Rails' load interlock](https://guides.rubyonrails.org/threading_and_code_execution.html#load-interlock) mechanism. The load interlock mechanism prevents a thread from using Rails autoloading mechanism to load constants while the application code is still running inside another thread.
 
 This issue only occurs in the development environment as Rails' load interlock is not used in production environments. Although we're not sure, we believe this issue may not occur with the new `zeitwerk` code loader.
 
 ### Solutions
 
-
 #### 1. Bypass Rails' load interlock with `.permit_concurrent_loads`
 
-Wrap the first request inside a block that will allow concurrent loads, [`ActiveSupport::Dependencies.interlock.permit_concurrent_loads`](https://guides.rubyonrails.org/threading_and_code_execution.html#permit-concurrent-loads). Anything wrapped inside the `.permit_concurrent_loads` block will bypass the load interlock mechanism, allowing new threads to access the Rails environment and boot properly. 
+Wrap the first request inside a block that will allow concurrent loads: [`ActiveSupport::Dependencies.interlock.permit_concurrent_loads`](https://guides.rubyonrails.org/threading_and_code_execution.html#permit-concurrent-loads). Anything wrapped inside the `.permit_concurrent_loads` block will bypass the load interlock mechanism, allowing new threads to access the Rails environment and boot properly. 
 
 ###### Example