puma 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88dc01e1628aacb4ee705cc2ab0ecda793913c284737acf93c92674b45a8ec93
-  data.tar.gz: bcfb46e65dc12b753628656ed7450643a6e6b2a451e2024c872275aa72f28422
+  metadata.gz: 924532a143ed6cf14fc8bdb83d981c96d726d9c8e7a12dcd89731de44de0df1d
+  data.tar.gz: ae9c1df1ac65e72b4304fb580e0ed7b75c4222411dae83a01623b11af2cba3ea
 SHA512:
-  metadata.gz: 0b5815aa75f4b0f0af4e8e1a2ecb3f46d7fc9e9c6c9f340f5ee8b4c4f1def02d24736a685520699ed46946557a7b1355ff1df765fd7670fb8ecbbc5d4df5eb64
-  data.tar.gz: f4294d0f1c811b4e230fa42162be39abab57c6c14d0c2b81a887893a997e8864b3afe9e06c32a2f5185166cfa680b6c1f66c473ef7f839c1430f41248f782793
+  metadata.gz: cdaa61be2208907f4c525273b48c621791f5858ad8ba007edfb7795012d6f8f01c66037d203803b7b0b67eaf735decf2fdb3195b67e67fc433b96249f672a175
+  data.tar.gz: d1034bd1c2af41740702ad4b905060600c47f5583e0debbdb9e482c320a1c5f84c4de49a4882b558d0b45f6284382100192aa9d286c122956c4f0a6fd56d5da9

data/History.md

@@ -1,19 +1,29 @@
-## 5.1.0
+## 5.1.0 / 2020-11-30
 
 * Features
-  * Your feature goes here <Most recent on the top, like GitHub> (#Github Number)
-  * Integrate with systemd's watchdog and notification features (#2438)
-  * Adds max_fast_inline as a configuration option for the Server object (#2406)
+  * Phased restart availability is now always logged, even if it is not available.
+  * Prints the loaded configuration if the environment variable `PUMA_LOG_CONFIG` is present ([#2472])
+  * Integrate with systemd's watchdog and notification features ([#2438])
+  * Adds max_fast_inline as a configuration option for the Server object ([#2406])
+  * You can now fork workers from worker 0 using SIGURG w/o fork_worker enabled [#2449]
+  * Add option to bind to systemd activated sockets ([#2362])
+  * Add compile option to change the `QUERY_STRING` max length ([#2485])
 
 * Bugfixes
-  * Your bugfix goes here <Most recent on the top, like GitHub> (#Github Number)
-  * Ignore illegal (by Rack spec) response header (#2439)
-  * Close idle connections immediately on shutdown (#2460)
+  * Fix JRuby handling in Puma::DSL#ssl_bind ([#2489])
+  * control_cli.rb - all normal output should be to @stdout ([#2487])
+  * Catch 'Error in reactor loop escaped: mode not supported for this object: r' ([#2477])
+  * Ignore Rails' reaper thread (and any thread marked forksafe) for warning ([#2475])
+  * Ignore illegal (by Rack spec) response header ([#2439])
+  * Close idle connections immediately on shutdown ([#2460])
+  * Fix some instances of phased restart errors related to the `json` gem ([#2473])
+  * Remove use of `json` gem to fix phased restart errors ([#2479])
+  * Fix grouping regexp of ILLEGAL_HEADER_KEY_REGEX ([#2495])
 
 ## 5.0.4 / 2020-10-27
 
 * Bugfixes
-  * Pass preloaded application into new workers if available when using `preload_app` (#2461)
+  * Pass preloaded application into new workers if available when using `preload_app` ([#2461], [#2454])
 
 ## 5.0.3 / 2020-10-26
 
@@ -21,7 +31,7 @@
   * Add Client#io_ok?, check before Reactor#register ([#2432])
   * Fix hang on shutdown in refork ([#2442])
   * Fix `Bundler::GemNotFound` errors for `nio4r` gem during phased restarts ([#2427], [#2018])
-  * Server run thread safety fix ([#2435]) 
+  * Server run thread safety fix ([#2435])
   * Fire `on_booted` after server starts ([#2431], [#2212])
   * Cleanup daemonization in rc.d script ([#2409])
 
@@ -33,11 +43,12 @@
   * client.rb - remove JRuby specific 'finish' code ([#2412])
   * Consolidate fast_write calls in Server, extract early_hints assembly ([#2405])
   * Remove upstart from docs ([#2408])
+  * Extract worker process into separate class ([#2374])
   * Consolidate option handling in Server, Server small refactors, doc changes ([#2389])
 
 ## 5.0.2 / 2020-09-28
 
-* Bugfixes 
+* Bugfixes
   * Reverted API changes to Server.
 
 ## 5.0.1 / 2020-09-28
@@ -76,7 +87,7 @@
   * min_threads now set by environment variables PUMA_MIN_THREADS and MIN_THREADS. ([#2143])
   * max_threads now set by environment variables PUMA_MAX_THREADS and MAX_THREADS. ([#2143])
   * max_threads default to 5 in MRI or 16 for all other interpreters. ([#2143])
-  * preload by default if workers > 1 ([#2143])
+  * `preload_app!` is on by default if number of workers > 1 and set via `WEB_CONCURRENCY` ([#2143])
   * Puma::Plugin.workers_supported? has been removed. Use Puma.forkable? instead. ([#2143])
   * `tcp_mode` has been removed without replacement. ([#2169])
   * Daemonization has been removed without replacement. ([#2170])
@@ -134,6 +145,11 @@
   * Explicitly include ctype.h to fix compilation warning and build error on macOS with Xcode 12 ([#2304])
   * Don't require json at boot ([#2269])
 
+## 4.3.7 / 2020-11-30
+
+* Bugfixes
+  * Backport set CONTENT_LENGTH for chunked requests (Originally: [#2287], backport: [#2496])
+
 ## 4.3.4/4.3.5 and 3.12.5/3.12.6 / 2020-05-22
 
 Each patchlevel release contains a separate security fix. We recommend simply upgrading to 4.3.5/3.12.6.
@@ -1651,6 +1667,23 @@ 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)
 
+[#2472]:https://github.com/puma/puma/pull/2472     "PR by @ccverak, merged 2020-11-02"
+[#2438]:https://github.com/puma/puma/pull/2438     "PR by @ekohl, merged 2020-10-26"
+[#2406]:https://github.com/puma/puma/pull/2406     "PR by @fdel15, merged 2020-10-19"
+[#2449]:https://github.com/puma/puma/pull/2449     "PR by @MSP-Greg, merged 2020-10-28"
+[#2362]:https://github.com/puma/puma/pull/2362     "PR by @ekohl, merged 2020-11-10"
+[#2485]:https://github.com/puma/puma/pull/2485     "PR by @elct9620, merged 2020-11-18"
+[#2489]:https://github.com/puma/puma/pull/2489     "PR by @MSP-Greg, merged 2020-11-27"
+[#2487]:https://github.com/puma/puma/pull/2487     "PR by @MSP-Greg, merged 2020-11-17"
+[#2477]:https://github.com/puma/puma/pull/2477     "PR by @MSP-Greg, merged 2020-11-16"
+[#2475]:https://github.com/puma/puma/pull/2475     "PR by @nateberkopec, merged 2020-11-02"
+[#2439]:https://github.com/puma/puma/pull/2439     "PR by @kuei0221, merged 2020-10-26"
+[#2460]:https://github.com/puma/puma/pull/2460     "PR by @cjlarose, merged 2020-10-27"
+[#2473]:https://github.com/puma/puma/pull/2473     "PR by @cjlarose, merged 2020-11-01"
+[#2479]:https://github.com/puma/puma/pull/2479     "PR by @cjlarose, merged 2020-11-10"
+[#2495]:https://github.com/puma/puma/pull/2495     "PR by @JuanitoFatas, merged 2020-11-27"
+[#2461]:https://github.com/puma/puma/pull/2461     "PR by @cjlarose, merged 2020-10-27"
+[#2454]:https://github.com/puma/puma/issues/2454   "Issue by @majksner, closed 2020-10-27"
 [#2432]:https://github.com/puma/puma/pull/2432     "PR by @MSP-Greg, merged 2020-10-25"
 [#2442]:https://github.com/puma/puma/pull/2442     "PR by @wjordan, merged 2020-10-22"
 [#2427]:https://github.com/puma/puma/pull/2427     "PR by @cjlarose, merged 2020-10-20"
@@ -1666,22 +1699,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2412]:https://github.com/puma/puma/pull/2412     "PR by @MSP-Greg, merged 2020-10-06"
 [#2405]:https://github.com/puma/puma/pull/2405     "PR by @MSP-Greg, merged 2020-10-05"
 [#2408]:https://github.com/puma/puma/pull/2408     "PR by @fliiiix, merged 2020-10-03"
-[#2389]:https://github.com/puma/puma/pull/2389     "PR by @MSP-Greg, merged 2020-09-29"
-[#2432]:https://github.com/puma/puma/pull/2432     "PR by @MSP-Greg, merged 2020-10-25"
-[#2442]:https://github.com/puma/puma/pull/2442     "PR by @wjordan, merged 2020-10-22"
-[#2427]:https://github.com/puma/puma/pull/2427     "PR by @cjlarose, merged 2020-10-20"
-[#2018]:https://github.com/puma/puma/issues/2018   "Issue by @gingerlime, closed 2020-10-20"
-[#2435]:https://github.com/puma/puma/pull/2435     "PR by @wjordan, merged 2020-10-20"
-[#2431]:https://github.com/puma/puma/pull/2431     "PR by @wjordan, merged 2020-10-16"
-[#2212]:https://github.com/puma/puma/issues/2212   "Issue by @junaruga, closed 2020-10-16"
-[#2409]:https://github.com/puma/puma/pull/2409     "PR by @fliiiix, merged 2020-10-03"
-[#2448]:https://github.com/puma/puma/pull/2448     "PR by @MSP-Greg, merged 2020-10-25"
-[#2450]:https://github.com/puma/puma/pull/2450     "PR by @MSP-Greg, merged 2020-10-25"
-[#2419]:https://github.com/puma/puma/pull/2419     "PR by @MSP-Greg, merged 2020-10-09"
-[#2279]:https://github.com/puma/puma/pull/2279     "PR by @wjordan, merged 2020-10-06"
-[#2412]:https://github.com/puma/puma/pull/2412     "PR by @MSP-Greg, merged 2020-10-06"
-[#2405]:https://github.com/puma/puma/pull/2405     "PR by @MSP-Greg, merged 2020-10-05"
-[#2408]:https://github.com/puma/puma/pull/2408     "PR by @fliiiix, merged 2020-10-03"
+[#2374]:https://github.com/puma/puma/pull/2374     "PR by @cjlarose, merged 2020-09-29"
 [#2389]:https://github.com/puma/puma/pull/2389     "PR by @MSP-Greg, merged 2020-09-29"
 [#2381]:https://github.com/puma/puma/pull/2381     "PR by @joergschray, merged 2020-09-24"
 [#2271]:https://github.com/puma/puma/pull/2271     "PR by @wjordan, merged 2020-09-24"
@@ -1708,10 +1726,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2288]:https://github.com/puma/puma/pull/2288     "PR by @FTLam11, merged 2020-06-02"
 [#1487]:https://github.com/puma/puma/pull/1487     "PR by @jxa, merged 2018-05-09"
 [#2143]:https://github.com/puma/puma/pull/2143     "PR by @jalevin, merged 2020-04-21"
-[#2143]:https://github.com/puma/puma/pull/2143     "PR by @jalevin, merged 2020-04-21"
-[#2143]:https://github.com/puma/puma/pull/2143     "PR by @jalevin, merged 2020-04-21"
-[#2143]:https://github.com/puma/puma/pull/2143     "PR by @jalevin, merged 2020-04-21"
-[#2143]:https://github.com/puma/puma/pull/2143     "PR by @jalevin, merged 2020-04-21"
 [#2169]:https://github.com/puma/puma/pull/2169     "PR by @nateberkopec, merged 2020-03-10"
 [#2170]:https://github.com/puma/puma/pull/2170     "PR by @nateberkopec, merged 2020-03-10"
 [#2076]:https://github.com/puma/puma/pull/2076     "PR by @drews256, merged 2020-02-27"
@@ -1732,7 +1746,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2198]:https://github.com/puma/puma/pull/2198     "PR by @eregon, merged 2020-03-24"
 [#2216]:https://github.com/puma/puma/pull/2216     "PR by @praboud-stripe, merged 2020-04-06"
 [#2122]:https://github.com/puma/puma/pull/2122     "PR by @wjordan, merged 2020-04-10"
-[#2220]:https://github.com/puma/puma/pull/2220     "PR by @wjordan, merged 2020-04-14"
 [#2177]:https://github.com/puma/puma/issues/2177   "Issue by @GuiTeK, closed 2020-04-08"
 [#2221]:https://github.com/puma/puma/pull/2221     "PR by @wjordan, merged 2020-04-17"
 [#2233]:https://github.com/puma/puma/pull/2233     "PR by @ayufan, merged 2020-04-25"
@@ -1741,7 +1754,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2267]:https://github.com/puma/puma/pull/2267     "PR by @wjordan, merged 2020-05-20"
 [#2287]:https://github.com/puma/puma/pull/2287     "PR by @eugeneius, merged 2020-05-31"
 [#2317]:https://github.com/puma/puma/pull/2317     "PR by @MSP-Greg, merged 2020-09-01"
-[#2312]:https://github.com/puma/puma/pull/2312     "PR by @MSP-Greg, merged 2020-07-20"
 [#2319]:https://github.com/puma/puma/issues/2319   "Issue by @AlexWayfer, closed 2020-09-03"
 [#2326]:https://github.com/puma/puma/pull/2326     "PR by @rkistner, closed 2020-09-04"
 [#2299]:https://github.com/puma/puma/issues/2299   "Issue by @JohnPhillips31416, closed 2020-09-17"
@@ -1750,12 +1762,11 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#2111]:https://github.com/puma/puma/pull/2111     "PR by @wjordan, merged 2020-02-20"
 [#1980]:https://github.com/puma/puma/pull/1980     "PR by @nateberkopec, merged 2020-02-27"
 [#2189]:https://github.com/puma/puma/pull/2189     "PR by @jkowens, merged 2020-03-19"
-[#2220]:https://github.com/puma/puma/pull/2220     "PR by @wjordan, merged 2020-04-14"
 [#2124]:https://github.com/puma/puma/pull/2124     "PR by @wjordan, merged 2020-04-14"
 [#2223]:https://github.com/puma/puma/pull/2223     "PR by @wjordan, merged 2020-04-20"
 [#2239]:https://github.com/puma/puma/pull/2239     "PR by @wjordan, merged 2020-05-15"
 [#2304]:https://github.com/puma/puma/issues/2304   "Issue by @mpeltomaa, closed 2020-09-05"
-[#2269]:https://github.com/puma/puma/pull/2269     "PR by @MSP-Greg, merged 2020-08-31"
+[#2496]:https://github.com/puma/puma/pull/2496     "PR by @TheRusskiy, merged 2020-11-30"
 [#2132]:https://github.com/puma/puma/issues/2132   "Issue by @bmclean, closed 2020-02-28"
 [#2010]:https://github.com/puma/puma/pull/2010     "PR by @nateberkopec, merged 2019-10-07"
 [#2012]:https://github.com/puma/puma/pull/2012     "PR by @headius, merged 2019-10-07"
@@ -1783,8 +1794,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#1961]:https://github.com/puma/puma/pull/1961     "PR by @nateberkopec, merged 2019-09-11"
 [#1970]:https://github.com/puma/puma/pull/1970     "PR by @MSP-Greg, merged 2019-09-18"
 [#1946]:https://github.com/puma/puma/pull/1946     "PR by @nateberkopec, merged 2019-09-02"
-[#1941]:https://github.com/puma/puma/pull/1941     "PR by @MSP-Greg, merged 2019-09-02"
-[#1908]:https://github.com/puma/puma/pull/1908     "PR by @MSP-Greg, merged 2019-08-23"
 [#1831]:https://github.com/puma/puma/pull/1831     "PR by @spk, merged 2019-07-27"
 [#1816]:https://github.com/puma/puma/pull/1816     "PR by @ylecuyer, merged 2019-08-01"
 [#1844]:https://github.com/puma/puma/pull/1844     "PR by @ylecuyer, merged 2019-08-01"
@@ -1808,7 +1817,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#1872]:https://github.com/puma/puma/pull/1872     "PR by @MSP-Greg, merged 2019-07-30"
 [#1833]:https://github.com/puma/puma/issues/1833   "Issue by @julik, closed 2019-07-09"
 [#1888]:https://github.com/puma/puma/pull/1888     "PR by @ClikeX, merged 2019-08-06"
-[#1842]:https://github.com/puma/puma/issues/1842   "Issue by @nateberkopec, closed 2019-09-18"
 [#1829]:https://github.com/puma/puma/pull/1829     "PR by @Fudoshiki, merged 2019-07-09"
 [#1832]:https://github.com/puma/puma/pull/1832     "PR by @MSP-Greg, merged 2019-07-08"
 [#1827]:https://github.com/puma/puma/pull/1827     "PR by @amrrbakry, merged 2019-06-27"
@@ -1844,7 +1852,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#1604]:https://github.com/puma/puma/pull/1604     "PR by @schneems, merged 2018-07-02"
 [#1579]:https://github.com/puma/puma/pull/1579     "PR by @schneems, merged 2018-06-14"
 [#1506]:https://github.com/puma/puma/pull/1506     "PR by @dekellum, merged 2018-05-09"
-[#1487]:https://github.com/puma/puma/pull/1487     "PR by @jxa, merged 2018-05-09"
 [#1563]:https://github.com/puma/puma/pull/1563     "PR by @dannyfallon, merged 2018-05-01"
 [#1557]:https://github.com/puma/puma/pull/1557     "PR by @swrobel, merged 2018-05-09"
 [#1529]:https://github.com/puma/puma/pull/1529     "PR by @desnudopenguino, merged 2018-03-20"
@@ -1940,11 +1947,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#1138]:https://github.com/puma/puma/pull/1138     "PR by @steakknife, merged 2016-12-13"
 [#1118]:https://github.com/puma/puma/pull/1118     "PR by @hiroara, merged 2016-11-20"
 [#1075]:https://github.com/puma/puma/issues/1075   "Issue by @pvalena, closed 2016-09-06"
-[#1118]:https://github.com/puma/puma/pull/1118     "PR by @hiroara, merged 2016-11-20"
-[#1036]:https://github.com/puma/puma/issues/1036   "Issue by @matobinder, closed 2016-08-03"
-[#1120]:https://github.com/puma/puma/pull/1120     "PR by @prathamesh-sonpatki, merged 2016-11-21"
-[#1002]:https://github.com/puma/puma/issues/1002   "Issue by @mattyb, closed 2016-07-26"
-[#1089]:https://github.com/puma/puma/issues/1089   "Issue by @AdamBialas, closed 2016-09-17"
 [#932]:https://github.com/puma/puma/issues/932     "Issue by @everplays, closed 2016-07-24"
 [#519]:https://github.com/puma/puma/issues/519     "Issue by @tmornini, closed 2016-07-25"
 [#828]:https://github.com/puma/puma/issues/828     "Issue by @Zapotek, closed 2016-07-24"
@@ -1955,7 +1957,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#925]:https://github.com/puma/puma/issues/925     "Issue by @lokenmakwana, closed 2016-07-24"
 [#911]:https://github.com/puma/puma/issues/911     "Issue by @veganstraightedge, closed 2016-07-24"
 [#620]:https://github.com/puma/puma/issues/620     "Issue by @javanthropus, closed 2016-07-25"
-[#1027]:https://github.com/puma/puma/issues/1027   "Issue by @rosenfeld, closed 2016-07-24"
 [#778]:https://github.com/puma/puma/issues/778     "Issue by @niedhui, closed 2016-07-24"
 [#1021]:https://github.com/puma/puma/pull/1021     "PR by @sarahzrf, merged 2016-07-20"
 [#1022]:https://github.com/puma/puma/issues/1022   "Issue by @AKovtunov, closed 2017-08-16"
@@ -1983,7 +1984,6 @@ be added back in a future date when a java Puma::MiniSSL is added.
 [#788]:https://github.com/puma/puma/issues/788     "Issue by @herregroen, closed 2016-04-07"
 [#894]:https://github.com/puma/puma/issues/894     "Issue by @rafbm, closed 2016-04-07"
 [#937]:https://github.com/puma/puma/issues/937     "Issue by @huangxiangdan, closed 2016-04-07"
-[#840]:https://github.com/puma/puma/issues/840     "Issue by @maxkwallace, closed 2016-04-07"
 [#945]:https://github.com/puma/puma/pull/945       "PR by @dekellum, merged 2016-04-07"
 [#946]:https://github.com/puma/puma/pull/946       "PR by @vipulnsward, merged 2016-04-07"
 [#947]:https://github.com/puma/puma/pull/947       "PR by @vipulnsward, merged 2016-04-07"

data/README.md

@@ -64,20 +64,30 @@ You can run your Sinatra application with Puma from the command line like this:
 $ ruby app.rb -s Puma
 ```
 
-Or you can configure your Sinatra application to always use Puma:
+In order to actually configure Puma using a config file, like `puma.rb`, however, you need to use the `puma` executable. To do this, you must add a rackup file to your Sinatra app:
 
 ```ruby
-require 'sinatra'
-configure { set :server, :puma }
+# config.ru
+require './app'
+run Sinatra::Application
+```
+
+You can then start your application using:
+
+```
+$ bundle exec puma
 ```
 
 ## Configuration
 
-Puma provides numerous options. Consult `puma -h` (or `puma --help`) for a full list of CLI options, or see [dsl.rb](https://github.com/puma/puma/blob/master/lib/puma/dsl.rb).
+Puma provides numerous options. Consult `puma -h` (or `puma --help`) for a full list of CLI options, or see `Puma::DSL` or [dsl.rb](https://github.com/puma/puma/blob/master/lib/puma/dsl.rb).
 
 You can also find several configuration examples as part of the
 [test](https://github.com/puma/puma/tree/master/test/config) suite.
 
+For debugging purposes, you can set the environment variable `PUMA_LOG_CONFIG` with a value
+and the loaded configuration will be printed as part of the boot process.
+
 ### Thread Pool
 
 Puma uses a thread pool. You can set the minimum and maximum number of threads that are available in the pool with the `-t` (or `--threads`) flag:
@@ -136,12 +146,12 @@ before_fork do
 end
 ```
 
-Preloading can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and preload_app copies the code of master into the workers.
+Preloading can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and `preload_app!` copies the code of master into the workers.
 
 ### Error handling
 
 If puma encounters an error outside of the context of your application, it will respond with a 500 and a simple
-textual error message (see `lowlevel_error` in [this file](https://github.com/puma/puma/blob/master/lib/puma/server.rb)).
+textual error message (see `Puma::Server#lowlevel_error` or [server.rb](https://github.com/puma/puma/blob/master/lib/puma/server.rb)).
 You can specify custom behavior for this scenario. For example, you can report the error to your third-party
 error-tracking service (in this example, [rollbar](https://rollbar.com)):
 
@@ -194,7 +204,7 @@ $ puma -b 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert&ssl_cipher_fil
 $ puma -b 'ssl://127.0.0.1:9292?keystore=path_to_keystore&keystore-pass=keystore_password&ssl_cipher_list=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA'
 ```
 
-See https://www.openssl.org/docs/man1.0.2/apps/ciphers.html for cipher filter format and full list of cipher suites.
+See https://www.openssl.org/docs/man1.1.1/man1/ciphers.html for cipher filter format and full list of cipher suites.
 
 Disable TLS v1 with the `no_tlsv1` option:
 
@@ -210,7 +220,7 @@ Puma has a built-in status and control app that can be used to query and control
 $ puma --control-url tcp://127.0.0.1:9293 --control-token foo
 ```
 
-Puma will start the control server on localhost port 9293. All requests to the control server will need to include control token (in this case, `token=foo`) as a query parameter. This allows for simple authentication. Check out [status.rb](https://github.com/puma/puma/blob/master/lib/puma/app/status.rb) to see what the status app has available.
+Puma will start the control server on localhost port 9293. All requests to the control server will need to include control token (in this case, `token=foo`) as a query parameter. This allows for simple authentication. Check out `Puma::App::Status` or [status.rb](https://github.com/puma/puma/blob/master/lib/puma/app/status.rb) to see what the status app has available.
 
 You can also interact with the control server via `pumactl`. This command will restart Puma:
 
@@ -236,19 +246,19 @@ If you want to prevent Puma from looking for a configuration file in those locat
 $ puma -C "-"
 ```
 
-The other side-effects of setting the environment are whether to show stack traces (in `development` or `test`), and setting RACK_ENV may potentially affect middleware looking for this value to change their behavior. The default puma RACK_ENV value is `development`. You can see all config default values [here](https://github.com/puma/puma/blob/12d1706ddc71b89ed2ee26275e31c788e94ff541/lib/puma/configuration.rb#L170).
+The other side-effects of setting the environment are whether to show stack traces (in `development` or `test`), and setting RACK_ENV may potentially affect middleware looking for this value to change their behavior. The default puma RACK_ENV value is `development`. You can see all config default values in `Puma::Configuration#puma_default_options` or [configuration.rb](https://github.com/puma/puma/blob/61c6213fbab/lib/puma/configuration.rb#L182-L204).
 
-Check out [dsl.rb](https://github.com/puma/puma/blob/master/lib/puma/dsl.rb) to see all available options.
+Check out `Puma::DSL` or [dsl.rb](https://github.com/puma/puma/blob/master/lib/puma/dsl.rb) to see all available options.
 
 ## Restart
 
 Puma includes the ability to restart itself. When available (MRI, Rubinius, JRuby), Puma performs a "hot restart". This is the same functionality available in *Unicorn* and *NGINX* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
 
-For more, see the [restart documentation](https://github.com/puma/puma/blob/master/docs/restart.md).
+For more, see the [Restart documentation](docs/restart.md).
 
 ## Signals
 
-Puma responds to several signals. A detailed guide to using UNIX signals with Puma can be found in the [signals documentation](https://github.com/puma/puma/blob/master/docs/signals.md).
+Puma responds to several signals. A detailed guide to using UNIX signals with Puma can be found in the [Signals documentation](docs/signals.md).
 
 ## Platform Constraints
 
@@ -278,8 +288,8 @@ It is common to use process monitors with Puma. Modern process monitors like sys
 provide continuous monitoring and restarts for increased
 reliability in production environments:
 
-* [docs/jungle](https://github.com/puma/puma/tree/master/docs/jungle) for rc.d
-* [docs/systemd](https://github.com/puma/puma/blob/master/docs/systemd.md)
+* [rc.d](docs/jungle/rc.d/README.md)
+* [systemd](docs/systemd.md)
 
 ## Community Extensions
 
@@ -295,9 +305,7 @@ reliability in production environments:
 
 ## Contributing
 
-Find details for contributing in the [contribution guide].
-
-[contribution guide]: https://github.com/puma/puma/blob/master/CONTRIBUTING.md
+Find details for contributing in the [contribution guide](CONTRIBUTING.md).
 
 ## License
 

data/docs/compile_options.md

@@ -0,0 +1,19 @@
+# Compile Options
+
+There provide some `cflags` to change Puma's default configuration for C.
+
+## Query String
+
+By default, the max length of `QUERY_STRING` is `1024 * 10`. But you may want to adjust it to allow accept large queries in the GET requests.
+
+For manual install
+
+```
+gem install puma -- --with-cflags="-D PUMA_QUERY_STRING_MAX_LENGTH=64000"
+```
+
+For bundler config
+
+```
+bundle config build.puma --with-cflags="-D PUMA_QUERY_STRING_MAX_LENGTH=64000"
+```

data/docs/fork_worker.md

@@ -24,6 +24,8 @@ Similar to the `preload_app!` option, the `fork_worker` option allows your appli
 
 ### Limitations
 
+- Not compatible with the `preload_app!` option
+
 - This mode is still very experimental so there may be bugs or edge-cases, particularly around expected behavior of existing hooks. Please open a [bug report](https://github.com/puma/puma/issues/new?template=bug_report.md) if you encounter any issues.
 
 - In order to fork new workers cleanly, worker 0 shuts down its server and stops serving requests so there are no open file descriptors or other kinds of shared global state between processes, and to maximize copy-on-write efficiency across the newly-forked workers. This may temporarily reduce total capacity of the cluster during a phased restart / refork.

data/docs/systemd.md

@@ -24,8 +24,15 @@ After=network.target
 # Requires=puma.socket
 
 [Service]
-# Foreground process (do not use --daemon in ExecStart or config.rb)
-Type=simple
+# Puma supports systemd's `Type=notify` and watchdog service
+# monitoring, if the [sd_notify](https://github.com/agis/ruby-sdnotify) gem is installed,
+# as of Puma 5.1 or later.
+# On earlier versions of Puma or JRuby, change this to `Type=simple` and remove
+# the `WatchdogSec` line.
+Type=notify
+
+# If your Puma process locks up, systemd's watchdog will restart it within seconds.
+WatchdogSec=10
 
 # Preferably configure a non-privileged user
 # User=
@@ -122,6 +129,21 @@ Puma will detect the release path socket as different than the one provided by
 systemd and attempt to bind it again, resulting in the exception
  `There is already a server bound to:`.
 
+### Binding
+
+By default you need to configure puma to have binds matching with all
+ListenStream statements. Any mismatched systemd ListenStreams will be closed by
+puma.
+
+To automatically bind to all activated sockets, the option
+`--bind-to-activated-sockets` can be used. This matches the config DSL
+`bind_to_activated_sockets` statement. This will cause puma to create a bind
+automatically for any activated socket. When systemd socket activation is not
+enabled, this option does nothing.
+
+This also accepts an optional argument `only` (DSL: `'only'`) to discard any
+binds that's not socket activated.
+
 ## Usage
 
 Without socket activation, use `systemctl` as root (e.g. via `sudo`) as

data/ext/puma_http11/extconf.rb

@@ -17,12 +17,11 @@ unless ENV["DISABLE_SSL"]
     have_header "openssl/bio.h"
 
     # below is  yes for 1.0.2 & later
-    have_func  "DTLS_method"                  , "openssl/ssl.h"
+    have_func  "DTLS_method"                           , "openssl/ssl.h"
 
-    # below are yes for 1.1.0 & later, may need to check func rather than macro
-    # with versions after 1.1.1
-    have_func  "TLS_server_method"            , "openssl/ssl.h"
-    have_macro "SSL_CTX_set_min_proto_version", "openssl/ssl.h"
+    # below are yes for 1.1.0 & later
+    have_func  "TLS_server_method"                     , "openssl/ssl.h"
+    have_func  "SSL_CTX_set_min_proto_version(NULL, 0)", "openssl/ssl.h"
   end
 end
 

data/ext/puma_http11/http11_parser.c

@@ -33,12 +33,12 @@ static void snake_upcase_char(char *c)
 /** Machine **/
 
 
-#line 79 "ext/puma_http11/http11_parser.rl"
+#line 81 "ext/puma_http11/http11_parser.rl"
 
 
 /** Data **/
 
-#line 40 "ext/puma_http11/http11_parser.c"
+#line 42 "ext/puma_http11/http11_parser.c"
 static const int puma_parser_start = 1;
 static const int puma_parser_first_final = 46;
 static const int puma_parser_error = 0;
@@ -46,17 +46,17 @@ static const int puma_parser_error = 0;
 static const int puma_parser_en_main = 1;
 
 
-#line 83 "ext/puma_http11/http11_parser.rl"
+#line 85 "ext/puma_http11/http11_parser.rl"
 
 int puma_parser_init(puma_parser *parser)  {
   int cs = 0;
   
-#line 53 "ext/puma_http11/http11_parser.c"
+#line 55 "ext/puma_http11/http11_parser.c"
 	{
 	cs = puma_parser_start;
 	}
 
-#line 87 "ext/puma_http11/http11_parser.rl"
+#line 89 "ext/puma_http11/http11_parser.rl"
   parser->cs = cs;
   parser->body_start = 0;
   parser->content_len = 0;
@@ -85,7 +85,7 @@ size_t puma_parser_execute(puma_parser *parser, const char *buffer, size_t len,
   assert((size_t) (pe - p) == len - off && "pointers aren't same distance");
 
   
-#line 87 "ext/puma_http11/http11_parser.c"
+#line 89 "ext/puma_http11/http11_parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -109,14 +109,14 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 118 "ext/puma_http11/http11_parser.c"
+#line 120 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr2;
 		case 36: goto st27;
@@ -132,7 +132,7 @@ case 2:
 		goto st27;
 	goto st0;
 tr2:
-#line 48 "ext/puma_http11/http11_parser.rl"
+#line 50 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_method(parser, PTR_TO(mark), LEN(mark, p));
   }
@@ -141,7 +141,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 143 "ext/puma_http11/http11_parser.c"
+#line 145 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 42: goto tr4;
 		case 43: goto tr5;
@@ -158,67 +158,67 @@ case 3:
 		goto tr5;
 	goto st0;
 tr4:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 167 "ext/puma_http11/http11_parser.c"
+#line 169 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 35: goto tr9;
 	}
 	goto st0;
 tr8:
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
 tr31:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
-#line 54 "ext/puma_http11/http11_parser.rl"
+#line 56 "ext/puma_http11/http11_parser.rl"
 	{
     parser->fragment(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
 tr33:
-#line 54 "ext/puma_http11/http11_parser.rl"
+#line 56 "ext/puma_http11/http11_parser.rl"
 	{
     parser->fragment(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
 tr37:
-#line 67 "ext/puma_http11/http11_parser.rl"
+#line 69 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
   }
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
 tr41:
-#line 58 "ext/puma_http11/http11_parser.rl"
+#line 60 "ext/puma_http11/http11_parser.rl"
 	{ MARK(query_start, p); }
-#line 59 "ext/puma_http11/http11_parser.rl"
+#line 61 "ext/puma_http11/http11_parser.rl"
 	{
     parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
 tr44:
-#line 59 "ext/puma_http11/http11_parser.rl"
+#line 61 "ext/puma_http11/http11_parser.rl"
 	{
     parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
@@ -227,19 +227,19 @@ st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 229 "ext/puma_http11/http11_parser.c"
+#line 231 "ext/puma_http11/http11_parser.c"
 	if ( (*p) == 72 )
 		goto tr10;
 	goto st0;
 tr10:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 241 "ext/puma_http11/http11_parser.c"
+#line 243 "ext/puma_http11/http11_parser.c"
 	if ( (*p) == 84 )
 		goto st7;
 	goto st0;
@@ -297,21 +297,21 @@ case 13:
 		goto st13;
 	goto st0;
 tr18:
-#line 63 "ext/puma_http11/http11_parser.rl"
+#line 65 "ext/puma_http11/http11_parser.rl"
 	{
     parser->http_version(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st14;
 tr26:
-#line 44 "ext/puma_http11/http11_parser.rl"
+#line 46 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
-#line 45 "ext/puma_http11/http11_parser.rl"
+#line 47 "ext/puma_http11/http11_parser.rl"
 	{
     parser->http_field(parser, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
   }
 	goto st14;
 tr29:
-#line 45 "ext/puma_http11/http11_parser.rl"
+#line 47 "ext/puma_http11/http11_parser.rl"
 	{
     parser->http_field(parser, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
   }
@@ -320,7 +320,7 @@ st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-#line 322 "ext/puma_http11/http11_parser.c"
+#line 324 "ext/puma_http11/http11_parser.c"
 	if ( (*p) == 10 )
 		goto st15;
 	goto st0;
@@ -360,7 +360,7 @@ case 16:
 		goto tr22;
 	goto st0;
 tr22:
-#line 71 "ext/puma_http11/http11_parser.rl"
+#line 73 "ext/puma_http11/http11_parser.rl"
 	{
     parser->body_start = p - buffer + 1;
     parser->header_done(parser, p + 1, pe - p - 1);
@@ -371,23 +371,23 @@ st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 373 "ext/puma_http11/http11_parser.c"
+#line 375 "ext/puma_http11/http11_parser.c"
 	goto st0;
 tr21:
-#line 38 "ext/puma_http11/http11_parser.rl"
+#line 40 "ext/puma_http11/http11_parser.rl"
 	{ MARK(field_start, p); }
-#line 39 "ext/puma_http11/http11_parser.rl"
+#line 41 "ext/puma_http11/http11_parser.rl"
 	{ snake_upcase_char((char *)p); }
 	goto st17;
 tr23:
-#line 39 "ext/puma_http11/http11_parser.rl"
+#line 41 "ext/puma_http11/http11_parser.rl"
 	{ snake_upcase_char((char *)p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 389 "ext/puma_http11/http11_parser.c"
+#line 391 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 33: goto tr23;
 		case 58: goto tr24;
@@ -413,71 +413,71 @@ case 17:
 		goto tr23;
 	goto st0;
 tr24:
-#line 40 "ext/puma_http11/http11_parser.rl"
+#line 42 "ext/puma_http11/http11_parser.rl"
 	{
     parser->field_len = LEN(field_start, p);
   }
 	goto st18;
 tr27:
-#line 44 "ext/puma_http11/http11_parser.rl"
+#line 46 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st18;
 st18:
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-#line 428 "ext/puma_http11/http11_parser.c"
+#line 430 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 13: goto tr26;
 		case 32: goto tr27;
 	}
 	goto tr25;
 tr25:
-#line 44 "ext/puma_http11/http11_parser.rl"
+#line 46 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st19;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-#line 442 "ext/puma_http11/http11_parser.c"
+#line 444 "ext/puma_http11/http11_parser.c"
 	if ( (*p) == 13 )
 		goto tr29;
 	goto st19;
 tr9:
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st20;
 tr38:
-#line 67 "ext/puma_http11/http11_parser.rl"
+#line 69 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
   }
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st20;
 tr42:
-#line 58 "ext/puma_http11/http11_parser.rl"
+#line 60 "ext/puma_http11/http11_parser.rl"
 	{ MARK(query_start, p); }
-#line 59 "ext/puma_http11/http11_parser.rl"
+#line 61 "ext/puma_http11/http11_parser.rl"
 	{
     parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
 	goto st20;
 tr45:
-#line 59 "ext/puma_http11/http11_parser.rl"
+#line 61 "ext/puma_http11/http11_parser.rl"
 	{
     parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 51 "ext/puma_http11/http11_parser.rl"
+#line 53 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
   }
@@ -486,7 +486,7 @@ st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-#line 488 "ext/puma_http11/http11_parser.c"
+#line 490 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr31;
 		case 60: goto st0;
@@ -500,14 +500,14 @@ case 20:
 		goto st0;
 	goto tr30;
 tr30:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st21;
 st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 509 "ext/puma_http11/http11_parser.c"
+#line 511 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr33;
 		case 60: goto st0;
@@ -521,14 +521,14 @@ case 21:
 		goto st0;
 	goto st21;
 tr5:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 530 "ext/puma_http11/http11_parser.c"
+#line 532 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 43: goto st22;
 		case 58: goto st23;
@@ -546,14 +546,14 @@ case 22:
 		goto st22;
 	goto st0;
 tr7:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st23;
 st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-#line 555 "ext/puma_http11/http11_parser.c"
+#line 557 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 34: goto st0;
@@ -566,14 +566,14 @@ case 23:
 		goto st0;
 	goto st23;
 tr6:
-#line 35 "ext/puma_http11/http11_parser.rl"
+#line 37 "ext/puma_http11/http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 575 "ext/puma_http11/http11_parser.c"
+#line 577 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr37;
 		case 34: goto st0;
@@ -587,7 +587,7 @@ case 24:
 		goto st0;
 	goto st24;
 tr39:
-#line 67 "ext/puma_http11/http11_parser.rl"
+#line 69 "ext/puma_http11/http11_parser.rl"
 	{
     parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
   }
@@ -596,7 +596,7 @@ st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 598 "ext/puma_http11/http11_parser.c"
+#line 600 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr41;
 		case 34: goto st0;
@@ -609,14 +609,14 @@ case 25:
 		goto st0;
 	goto tr40;
 tr40:
-#line 58 "ext/puma_http11/http11_parser.rl"
+#line 60 "ext/puma_http11/http11_parser.rl"
 	{ MARK(query_start, p); }
 	goto st26;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 618 "ext/puma_http11/http11_parser.c"
+#line 620 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr44;
 		case 34: goto st0;
@@ -1010,7 +1010,7 @@ case 45:
 	_out: {}
 	}
 
-#line 115 "ext/puma_http11/http11_parser.rl"
+#line 117 "ext/puma_http11/http11_parser.rl"
 
   if (!puma_parser_has_error(parser))
     parser->cs = cs;