From 0579486f154e80d17521494003dcd2499ef74688 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. Don't delete content-length before yielding inflate body, as that causes a switch to read the entire body instead of reading in chunks. Fixes [Bug #16672] https://github.com/ruby/net-http/commit/58284e9710 Co-authored-by: st0012 --- lib/net/http/response.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index ecbfd42d2b..9cedbdbbfe 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -431,6 +431,9 @@ class Net::HTTPResponse ensure begin inflate_body_io.finish + if self['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 @@ -532,6 +535,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