From 5a79d8e0507cd143100bf928a88a59a8b5a5bca6 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 30 May 2020 10:29:24 +0200
Subject: Fix error raised by Net::HTTPResponse#inflater if the block raises

* See https://bugs.ruby-lang.org/issues/13882#note-6
---
 lib/net/http/response.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index 5a94f95694..08eaeb2cac 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -268,12 +268,13 @@ class Net::HTTPResponse
 
       begin
         yield inflate_body_io
+        success = true
       ensure
-        orig_err = $!
         begin
           inflate_body_io.finish
         rescue => err
-          raise orig_err || err
+          # Ignore #finish's error if there is an exception from yield
+          raise err if success
         end
       end
     when 'none', 'identity' then
-- 
cgit v1.2.3