aboutsummaryrefslogtreecommitdiffstats
path: root/lib/net/http
diff options
context:
space:
mode:
authorktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-01 08:22:50 +0000
committerktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-01 08:22:50 +0000
commit7aa84c6f14ae5c117bdd7bbbe3151e13a1a86fa7 (patch)
tree3a55cc4b80ed0b7397cdfe96c7449480134ff3ac /lib/net/http
parentb10ae40b6b0c78305b5d7f6b6c7bc764c2623ac3 (diff)
downloadruby-7aa84c6f14ae5c117bdd7bbbe3151e13a1a86fa7.tar.gz
* 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/net/http')
-rw-r--r--lib/net/http/response.rb6
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