puma 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677c15b54efd114ff1e95b31d37efc806c3fdbc955988a2d33a37c4b4b10007f
-  data.tar.gz: fb375bd8be23a5945b5fa497b124444905a5364815e725636eaad86c7d42c5e2
+  metadata.gz: 15b598484e8fbdd9262dfdb0f4cc8ec379b48d8b3f83f6079533d216f37fb12d
+  data.tar.gz: d80fc6d21a8ead42565a112d6a4d53313796d729790df9d5be797218f40a7af4
 SHA512:
-  metadata.gz: 81fbd7fc8da45a1cf3a7dd7c233ae97a1cf41fb788a263ed14f4ce12c0ceac9c024d209f0a99ce61ed9a29e409e7c1442a266b43a89d87f7fb9537e3e6c3526a
-  data.tar.gz: 21651a742ad2ec25804b435b44c2cf3d7bca6f691a36d405f413a2b0f325216f45df5f983ada1b3b5367cf35306fae4d8de46613b657ea5c27a2097d74ba72fd
+  metadata.gz: 3d6a969b599e9e919de4cbead5963379261c4fee1190f361e80945a03ed0d0932e770b62dd37db1388ff473f09f40bca3fe477e82238e234246c0becf70f7553
+  data.tar.gz: 2c8be61d5340256eaaca6d093bfad46401199700472a971881dafb7661e0c44fa9bff699e1cd24c031f51b79b3f01854498f80988707933fb6abb1d0fc2bfe05

data/History.md

@@ -1,3 +1,10 @@
+## 6.2.1 / 2023-03-31
+
+* Bugfixes
+  * Fix java 8 compatibility ([#3109], [#3108])
+  * Always write io_buffer when in "enum bodies" branch. ([#3113], [#3112])
+  * Fix warn_if_in_single_mode incorrect message ([#3111])
+
 ## 6.2.0 / 2023-03-29
 
 * Features
@@ -1967,6 +1974,11 @@ be added back in a future date when a java Puma::MiniSSL is added.
 * Bugfixes
   * Your bugfix goes here <Most recent on the top, like GitHub> (#Github Number)
 
+[#3109]:https://github.com/puma/puma/pull/3109     "PR by @ahorek, merged 2023-03-31"
+[#3108]:https://github.com/puma/puma/issues/3108   "Issue by @treviateo, closed 2023-03-31"
+[#3113]:https://github.com/puma/puma/pull/3113     "PR by @collinsauve, merged 2023-03-31"
+[#3112]:https://github.com/puma/puma/issues/3112   "Issue by @dmke, closed 2023-03-31"
+[#3111]:https://github.com/puma/puma/pull/3111     "PR by @adzap, merged 2023-03-30"
 [#2770]:https://github.com/puma/puma/pull/2770     "PR by @vzajkov, merged 2023-03-29"
 [#2511]:https://github.com/puma/puma/issues/2511   "Issue by @jchristie55332, closed 2021-12-12"
 [#3089]:https://github.com/puma/puma/pull/3089     "PR by @Vuta, merged 2023-03-06"

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "6.2.0"
+    PUMA_VERSION = VERSION = "6.2.1"
     CODE_NAME = "Speaking of Now"
 
     PUMA_SERVER_STRING = ["puma", PUMA_VERSION, CODE_NAME].join(" ").freeze

data/lib/puma/dsl.rb

@@ -1103,7 +1103,7 @@ module Puma
       if (@options[:workers] || 0) == 0
         log_string =
           "Warning: You specified code to run in a `#{hook_name}` block, " \
-          "but Puma is configured to run in cluster mode, " \
+          "but Puma is not configured to run in cluster mode (worker count > 0 ), " \
           "so your `#{hook_name}` block did not run"
 
         LogWriter.stdio.log(log_string)

data/lib/puma/request.rb

@@ -180,7 +180,7 @@ module Puma
         if !content_length && !resp_info[:transfer_encoding] && status != 204
           if res_body.respond_to?(:to_ary) && (array_body = res_body.to_ary) &&
               array_body.is_a?(Array)
-            body = array_body
+            body = array_body.compact
             content_length = body.sum(&:bytesize)
           elsif res_body.is_a?(File) && res_body.respond_to?(:size)
             body = res_body
@@ -363,12 +363,19 @@ module Puma
       else
         # for enum bodies
         if chunked
+          empty_body = true
           body.each do |part|
-            next if (byte_size = part.bytesize).zero?
+            next if part.nil? || (byte_size = part.bytesize).zero?
+            empty_body = false
             io_buffer.append byte_size.to_s(16), LINE_END, part, LINE_END
             fast_write_str socket, io_buffer.read_and_reset
           end
-          fast_write_str socket, CLOSE_CHUNKED
+          if empty_body
+            io_buffer << CLOSE_CHUNKED
+            fast_write_str socket, io_buffer.read_and_reset
+          else
+            fast_write_str socket, CLOSE_CHUNKED
+          end
         else
           fast_write_str socket, io_buffer.read_and_reset
           body.each do |part|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Evan Phoenix