diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 08:39:18 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 08:39:18 +0000 |
| commit | a5ffcdaeffdc05bfa63c7f9542791798f2878757 (patch) | |
| tree | f695549bbcc06ee276bb294430145455d85c4183 /lib | |
| parent | d3cd7b4813dcaf4022d8d70b8dd9f2bd17812d56 (diff) | |
merge revision(s) 46681,51464,51465: [Backport #11058]
* lib/net/http/response.rb (Net::HTTPResponse.each_response_header):
raise first exception even if inflate_body_io.finish raises error.
when begin block raises error, finish usually raises error too.
* lib/net/http/response.rb (Net::HTTPResponse#inflater):
fix TypeError. An exception object might be nil.
[ruby-core:68846] [Bug #11058]
* lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish):
fix a bug that empty gzipped response body causes Zlib::BufError.
[ruby-core:68846] [Bug #11058]
* test/net/http/test_httpresponse.rb: tests for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http/response.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index a36b3af36b..95d4d0ce94 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -260,7 +260,12 @@ class Net::HTTPResponse begin yield inflate_body_io ensure - inflate_body_io.finish + orig_err = $! + begin + inflate_body_io.finish + rescue => err + raise orig_err || err + end end when 'none', 'identity' then self.delete 'content-encoding' @@ -355,6 +360,7 @@ class Net::HTTPResponse # Finishes the inflate stream. def finish + return if @inflate.total_in == 0 @inflate.finish end |