summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/http/response.rb7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ceddb2c8f0..571bb7cfd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 4 04:39:52 2014 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/net/http/response.rb (Net::HTTPResponse.each_response_header):
+ raise first exception even if inflate_body_io.finish raises error.
+ when begin block raises error, finish usually raises error too.
+
Fri Jul 4 02:56:04 2014 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/generic.rb (URI::Generic#query=): remove validation, just
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'