From 58adb1636be32fb95173f01e448673dbae4511b0 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Mon, 1 Mar 2021 13:48:06 -0800 Subject: [ruby/net-http] Update the content-length heading when decoding bodies Previously, the content-encoding header was removed and the body was modified, but the content-length header was not modified, resulting in the content-length header not matching the body length. Fixes [Bug #16672] https://github.com/ruby/net-http/commit/a7cb30124c --- lib/net/http/response.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index 08eaeb2cac..cbe16ca205 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -263,6 +263,7 @@ class Net::HTTPResponse case v&.downcase when 'deflate', 'gzip', 'x-gzip' then self.delete 'content-encoding' + had_content_length = self.delete 'content-length' inflate_body_io = Inflater.new(@socket) @@ -272,6 +273,9 @@ class Net::HTTPResponse ensure begin inflate_body_io.finish + if had_content_length + self['content-length'] = inflate_body_io.bytes_inflated.to_s + end rescue => err # Ignore #finish's error if there is an exception from yield raise err if success @@ -373,6 +377,14 @@ class Net::HTTPResponse @inflate.finish end + ## + # The number of bytes inflated, used to update the Content-Length of + # the response. + + def bytes_inflated + @inflate.total_out + end + ## # Returns a Net::ReadAdapter that inflates each read chunk into +dest+. # -- cgit v1.2.3