puma 5.3.0-java → 5.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7497bbe935eaedda6aabf9c47876bcdd0727dcfbe17835c9a7d025925fbe9fce
-  data.tar.gz: 13769e38a5e5845279f97ad77117d31da0403e9cd1a52d21417f41e40cecddb7
+  metadata.gz: 2e9bfe6e0d16878b7c08f452189b8b740fffa62ab86c1031a1f7bcff6826fbb2
+  data.tar.gz: cde6f178316ec5067a254669911999ae7f76d3a71fea25818c555613e648515f
 SHA512:
-  metadata.gz: b4901602b62972f60c4d56034bb7c0f64b6b562d423e5ab2a3d1002fc7edc8854f969919bd46f3b46b68efb15a08f02abb209d19988ac9b494897d2dd254aaa7
-  data.tar.gz: a2f58db0f3eff88455f03e47b9c0016682d89327796531bbff39f04a93b0a8ff3a3a3f7d3662af640cd2c60d198d3baa0cd961fccb451c45222e66d8b60ca3cf
+  metadata.gz: 6f93afa0f71745b4fd8888794fb78d04590fce5d2bcc897bcc69dcad114464cb3111a41782b7a06a1513270fe448ea2a9ee3d207521567b54e22d3815d45ccfd
+  data.tar.gz: 01c2be5ef8baab6014db28bda79f9d90b9252ec3859a66b1bdefaf2a12dcb9c24b8ca9cacf1e8cd57480e6a32562baa7f0528e14b3d1a8400320de8d3b1194ec

data/History.md

@@ -1,3 +1,8 @@
+## 5.3.1 / 2021-05-11
+
+* Security
+  * Close keepalive connections after the maximum number of fast inlined requests (#2625)
+
 ## 5.3.0 / 2021-05-07
 
 * Features
@@ -208,6 +213,11 @@
   * Support parallel tests in verbose progress reporting ([#2223])
   * Refactor error handling in server accept loop ([#2239])
 
+## 4.3.8 / 2021-05-11
+
+* Security
+  * Close keepalive connections after the maximum number of fast inlined requests (#2625)
+
 ## 4.3.7 / 2020-11-30
 
 * Bugfixes

data/lib/puma/const.rb

@@ -100,7 +100,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "5.3.0".freeze
+    PUMA_VERSION = VERSION = "5.3.1".freeze
     CODE_NAME = "Sweetnighter".freeze
 
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze

data/lib/puma/server.rb

@@ -447,15 +447,20 @@ module Puma
 
             requests += 1
 
-            check_for_more_data = @status == :run
+            # Closing keepalive sockets after they've made a reasonable
+            # number of requests allows Puma to service many connections
+            # fairly, even when the number of concurrent connections exceeds
+            # the size of the threadpool. It also allows cluster mode Pumas
+            # to keep load evenly distributed across workers, because clients
+            # are randomly assigned a new worker when opening a new connection.
+            #
+            # Previously, Puma would kick connections in this conditional back
+            # to the reactor. However, because this causes the todo set to increase
+            # in size, the wait_until_full mutex would never unlock, leaving
+            # any additional connections unserviced.
+            break if requests >= @max_fast_inline
 
-            if requests >= @max_fast_inline
-              # This will mean that reset will only try to use the data it already
-              # has buffered and won't try to read more data. What this means is that
-              # every client, independent of their request speed, gets treated like a slow
-              # one once every max_fast_inline requests.
-              check_for_more_data = false
-            end
+            check_for_more_data = @status == :run
 
             next_request_ready = with_force_shutdown(client) do
               client.reset(check_for_more_data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement