Use given content-length header to set body length

pilaf · pilaf · commit d7672e06bcd9 · 2025-03-09T15:52:12.000+09:00
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -32,11 +32,16 @@ class BodyReadWrapper < ::Protocol::HTTP::Body::Readable
 				#
 				# @parameter body [Interface(:read)] The input body to wrap.
 				# @parameter block_size [Integer] The size of the blocks to read from the body.
-				def initialize(body, block_size: 4096)
+				# @parameter length [Integer | Nil] The length of the body, if known.
+				def initialize(body, length = nil, block_size: 4096)
 					@body = body
+					@length = length
 					@block_size = block_size
 				end
 				
+				# @attribute [Integer | Nil] The total length of the body, or `nil` if the length is unknown.
+				attr :length
+				
 				# Close the body if possible.
 				def close(error = nil)
 					@body.close if @body.respond_to?(:close)
@@ -168,28 +173,29 @@ def call(env)
 				
 				def perform_request(env)
 					with_client(env) do |endpoint, client|
+						if headers = env.request_headers
+							headers = ::Protocol::HTTP::Headers[headers]
+							
+							# Use content-length to inform body length if given, but remove the header since it will be
+							# set for us later anyway, and not doing so could result in a duplicate content-length headers
+							# if capitalization differs
+							content_length = headers.delete("content-length")&.to_i
+						end
+						
 						if body = env.body
 							# We need to ensure the body is wrapped in a Readable object so that it can be read in chunks:
 							# Faraday's body only responds to `#read`.
 							if body.is_a?(::Protocol::HTTP::Body::Readable)
 								# Good to go
 							elsif body.respond_to?(:read)
-								body = BodyReadWrapper.new(body)
+								body = BodyReadWrapper.new(body, content_length)
 							else
-								body = ::Protocol::HTTP::Body::Buffered.wrap(body)
+								body = ::Protocol::HTTP::Body::Buffered.wrap(body).then do |buffered|
+									::Protocol::HTTP::Body::Buffered.new(buffered.chunks, content_length)
+								end
 							end
 						end
 						
-						if headers = env.request_headers
-              # Ignore Content-Length if given, it will be set for us later anyway (lowercased)
-              if headers.has_key?("Content-Length")
-                headers = headers.dup
-                headers.delete("Content-Length")
-              end
-              
-							headers = ::Protocol::HTTP::Headers[headers]
-						end
-						
 						method = env.method.to_s.upcase
 						
 						request = ::Protocol::HTTP::Request.new(endpoint.scheme, endpoint.authority, method, endpoint.path, nil, headers, body)
