summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2021-03-01 13:48:06 -0800
committergit <svn-admin@ruby-lang.org>2022-04-14 00:11:26 +0900
commit0579486f154e80d17521494003dcd2499ef74688 (patch)
tree2ca38db1c646e8497a14db7be23b990c853b6807 /lib
parent54b53e2c8fc06e708232e399e3970fd0ecc5c4a5 (diff)
[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 <stan001212@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/net/http/response.rb11
1 files changed, 11 insertions, 0 deletions
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
@@ -533,6 +536,14 @@ class Net::HTTPResponse
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+.
#
# This allows a large response body to be inflated without storing the