* 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

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index fd2db5ebf9..84dd1628d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug  1 17:05:18 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/net/http/response.rb (Net::HTTPResponse#inflater):
+	  fix TypeError. An exception object might be nil.
+	  [ruby-core:68846] [Bug #11058]
+
 Sat Aug  1 09:09:46 2015  Aaron Patterson <tenderlove@ruby-lang.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): Implement
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