diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-12 16:23:30 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-12 16:23:30 +0000 |
| commit | 070afc692e463f7cb5b2d1955d3405e5c53fb88d (patch) | |
| tree | 25d59f7871743965fbcd4796806170edf11f7835 /lib | |
| parent | 04a567fb4bb650b2b5c94851db6b59bd460e7da1 (diff) | |
merge revision(s) 51464,51465: [Backport #11058]
* 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_2@51555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http/response.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index 674faf2cfc..126c22160d 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -260,11 +260,11 @@ class Net::HTTPResponse begin yield inflate_body_io ensure - e = $! + orig_err = $! begin inflate_body_io.finish - rescue - raise e + rescue => err + raise orig_err || err end end when 'none', 'identity' then @@ -359,6 +359,7 @@ class Net::HTTPResponse # Finishes the inflate stream. def finish + return if @inflate.total_in == 0 @inflate.finish end |