From 6811973d1355ba40ee4b3fc5a43ed65b67aac9b7 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 3 Jul 2014 19:46:34 +0000
Subject: * lib/net/http/response.rb (Net::HTTP.each_response_header):   raise
 first exception even if inflate_body_io.finish raises error.   when begin
 block raises error, finish usually raises error too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/http/response.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index da3e4b4c8c..33a7804cdc 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -259,7 +259,12 @@ class Net::HTTPResponse
       begin
         yield inflate_body_io
       ensure
-        inflate_body_io.finish
+        e = $!
+        begin
+          inflate_body_io.finish
+        rescue
+          raise e
+        end
       end
     when 'none', 'identity' then
       self.delete 'content-encoding'
-- 
cgit v1.2.3