puma 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26655d47e2cc0987b78174ca6f6f7f9e16cfc584d1925cee08b2c4fd8d8a63e
-  data.tar.gz: 48aaec83462461d40fba5791679f8a81a677ea11731337d05213f358e1e1df01
+  metadata.gz: 469723b0faecde36baaac342696d0b59d73086f199a020e89d18ae33e2b181f0
+  data.tar.gz: cf2f9bb437d6bf29c6ad1fe5a166ed4db0c9c0c0d67a239d7f07e62b8d993a6b
 SHA512:
-  metadata.gz: e09ac76431f64ef08f5be4da5d2792e6ff7a152235534cc3c9a9798bf2bb34041fc98d6050b489598b1a9625bb9af13af355e3d4c9689cc055ab2790adbbcc8e
-  data.tar.gz: a2609c1568543ce1b41f51eff668e59ccacc79582c447fed74aeb334403e8f9212bb19f676ee2cd949f5209d240ab735495a5d364e549c4ab24676f1941801d5
+  metadata.gz: b677ffb75bd299a97fc19eefa2caf8f3a80b8db0600d980ea4700fcb1fd12fd7c4079182e38bc4fc43879e668bffdc757247f4024dfd7e0d13ceb29181debbc4
+  data.tar.gz: cd06e3f7cbecffafb7aec87831a24055f45f5e6313d8808ab797116efa9e410e01539382499465f3c23bb957aace762ba24a9deb8ecfdc1c4bf1f0cff852688d

data/History.md

@@ -1,3 +1,8 @@
+## 5.6.1 / 2022-01-26
+
+* Bugfixes
+  * Reverted a commit which appeared to be causing occasional blank header values ([#2809])
+
 ## 5.6.0 / 2022-01-25
 
 * Features
@@ -1830,6 +1835,7 @@ 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)
 
+[#2809]:https://github.com/puma/puma/pull/2809     "PR by @dentarg, merged 2022-01-26"
 [#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"

data/lib/puma/const.rb

@@ -100,7 +100,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "5.6.0".freeze
+    PUMA_VERSION = VERSION = "5.6.1".freeze
     CODE_NAME = "Birdie's Version".freeze
 
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze

data/lib/puma/request.rb

@@ -46,7 +46,11 @@ module Puma
       env[HIJACK_P] = true
       env[HIJACK] = client
 
-      env[RACK_INPUT] = client.body
+      body = client.body
+
+      head = env[REQUEST_METHOD] == HEAD
+
+      env[RACK_INPUT] = body
       env[RACK_URL_SCHEME] ||= default_server_port(env) == PORT_443 ? HTTPS : HTTP
 
       if @early_hints
@@ -65,58 +69,36 @@ module Puma
       # A rack extension. If the app writes #call'ables to this
       # array, we will invoke them when the request is done.
       #
-      env[RACK_AFTER_REPLY] = []
+      after_reply = env[RACK_AFTER_REPLY] = []
 
       begin
-        status, headers, res_body = @thread_pool.with_force_shutdown do
-          @app.call(env)
-        end
-
-        return :async if client.hijacked
-
-        status = status.to_i
-
-        if status == -1
-          unless headers.empty? and res_body == []
-            raise "async response must have empty headers and body"
+        begin
+          status, headers, res_body = @thread_pool.with_force_shutdown do
+            @app.call(env)
           end
 
-          return :async
-        end
-      rescue ThreadPool::ForceShutdown => e
-        @events.unknown_error e, client, "Rack app"
-        @events.log "Detected force shutdown of a thread"
-
-        status, headers, res_body = lowlevel_error(e, env, 503)
-      rescue Exception => e
-        @events.unknown_error e, client, "Rack app"
+          return :async if client.hijacked
 
-        status, headers, res_body = lowlevel_error(e, env, 500)
-      end
+          status = status.to_i
 
-      write_response(status, headers, res_body, lines, requests, client)
-    end
+          if status == -1
+            unless headers.empty? and res_body == []
+              raise "async response must have empty headers and body"
+            end
 
-    # Does the actual response writing for Request#handle_request and Server#client_error
-    #
-    # @param status [Integer] the status returned by the Rack application
-    # @param headers [Hash] the headers returned by the Rack application
-    # @param res_body [Array] the body returned by the Rack application
-    # @param lines [Puma::IOBuffer] modified in place
-    # @param requests [Integer] number of inline requests handled
-    # @param client [Puma::Client]
-    # @return [Boolean,:async]
-    def write_response(status, headers, res_body, lines, requests, client)
-      env = client.env
-      io  = client.io
+            return :async
+          end
+        rescue ThreadPool::ForceShutdown => e
+          @events.unknown_error e, client, "Rack app"
+          @events.log "Detected force shutdown of a thread"
 
-      return false if closed_socket?(io)
-      lines.clear
+          status, headers, res_body = lowlevel_error(e, env, 503)
+        rescue Exception => e
+          @events.unknown_error e, client, "Rack app"
 
-      head = env[REQUEST_METHOD] == HEAD
-      after_reply = env[RACK_AFTER_REPLY] || []
+          status, headers, res_body = lowlevel_error(e, env, 500)
+        end
 
-      begin
         res_info = {}
         res_info[:content_length] = nil
         res_info[:no_body] = head
@@ -167,9 +149,9 @@ module Puma
           res_body.each do |part|
             next if part.bytesize.zero?
             if chunked
-                fast_write io, (part.bytesize.to_s(16) << line_ending)
-                fast_write io, part            # part may have different encoding
-                fast_write io, line_ending
+               fast_write io, (part.bytesize.to_s(16) << line_ending)
+               fast_write io, part            # part may have different encoding
+               fast_write io, line_ending
             else
               fast_write io, part
             end
@@ -187,7 +169,7 @@ module Puma
       ensure
         uncork_socket io
 
-        client.body.close if client.body
+        body.close
         client.tempfile.unlink if client.tempfile
         res_body.close if res_body.respond_to? :close
 

data/lib/puma/server.rb

@@ -476,7 +476,7 @@ module Puma
         end
         true
       rescue StandardError => e
-        client_error(e, client, buffer, requests)
+        client_error(e, client)
         # The ensure tries to close +client+ down
         requests > 0
       ensure
@@ -504,36 +504,34 @@ module Puma
     # :nocov:
 
     # Handle various error types thrown by Client I/O operations.
-    def client_error(e, client, buffer = ::Puma::IOBuffer.new, requests = 1)
+    def client_error(e, client)
       # Swallow, do not log
       return if [ConnectionError, EOFError].include?(e.class)
 
+      lowlevel_error(e, client.env)
       case e
       when MiniSSL::SSLError
         @events.ssl_error e, client.io
       when HttpParserError
-        status, headers, res_body = lowlevel_error(e, client.env, 400)
-        write_response(status, headers, res_body, buffer, requests, client)
+        client.write_error(400)
         @events.parse_error e, client
       else
-        status, headers, res_body = lowlevel_error(e, client.env)
-        write_response(status, headers, res_body, buffer, requests, client)
+        client.write_error(500)
         @events.unknown_error e, nil, "Read"
       end
     end
 
     # A fallback rack response if +@app+ raises as exception.
     #
-    def lowlevel_error(e, env, status = 500)
+    def lowlevel_error(e, env, status=500)
       if handler = @options[:lowlevel_error_handler]
         if handler.arity == 1
-          handler_status, headers, res_body = handler.call(e)
+          return handler.call(e)
         elsif handler.arity == 2
-          handler_status, headers, res_body = handler.call(e, env)
+          return handler.call(e, env)
         else
-          handler_status, headers, res_body = handler.call(e, env, status)
+          return handler.call(e, env, status)
         end
-        return [handler_status || status, headers || {}, res_body || []]
       end
 
       if @leak_stack_on_error

metadata

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