puma 6.2.0-java → 6.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1730e627fcd3be4eb2040645996a10b30950aa494ef94fa33e707d54a8dc79a3
-  data.tar.gz: e0cb48ed002c40333aafa563e5ac0cb54a33efd707077f246d339afa638b52aa
+  metadata.gz: 6659952663ca1247a27a1d731a96489881d0db6bcdeb15d17bd92d90ece41064
+  data.tar.gz: 311b9aad92753880cd75092f32e0638493d0a4f29a835ad448af76f2bca2a656
 SHA512:
-  metadata.gz: 4d8e02f5f5cb53671fd3c4fde168816d7c47845401563262aef64b37868a0ceb19ae9186c02de42ccfcf996165fdd7309b4e0ed461f758bb2785405ea4908673
-  data.tar.gz: 23c3cc1a5583a44c5d46656afb5b1271dfb6f5100e01ca8b6d889e025829429f7495962b5d7c1fbff8cd7e44999ad5b3b18ba3f4fe6bab6757b8d3e328d7b5af
+  metadata.gz: 69e663cc10eb939cf94cf0adce7c5fe65b24974ac285cf198f98dfc348fce68cc46cdf821f0f2ed3d9924d8bdadcf583242c04d3f6d1f0adae3cb802a1e52702
+  data.tar.gz: e0d54567b32b35b8fc53a0f9829b664b1003e24af534bf8c1d8dc01bb2dc018c789a4f0b7975fbfa72687c19827f42b75024b4f5fa2884db7d4775b1ce40698f

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: java
 authors:
 - Evan Phoenix