diff options
| author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-01 08:22:50 +0000 |
|---|---|---|
| committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-01 08:22:50 +0000 |
| commit | d7bb66df2667040518186eb72928dedb4b7de6b9 (patch) | |
| tree | 3a55cc4b80ed0b7397cdfe96c7449480134ff3ac /lib | |
| parent | 35a76874dbfc56c350c591efff198f3526422f18 (diff) | |
* lib/net/http/response.rb (Net::HTTPResponse#inflater):
fix TypeError. An exception object might be nil.
[ruby-core:68846] [Bug #11058]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http/response.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index 674faf2cfc..253c5cbe98 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 |