block should not be called if IOError raised

Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/rack/body_proxy.rb b/lib/rack/body_proxy.rb
index 81e770dd..921af6ba 100644
--- a/lib/rack/body_proxy.rb
+++ b/lib/rack/body_proxy.rb
@@ -10,10 +10,12 @@ module Rack
 
     def close
       raise IOError, "closed stream" if @closed
-      @body.close if @body.respond_to? :close
-    ensure
-      @block.call
-      @closed = true
+      begin
+        @body.close if @body.respond_to? :close
+      ensure
+        @block.call
+        @closed = true
+      end
     end
 
     def closed?
diff --git a/test/spec_body_proxy.rb b/test/spec_body_proxy.rb
index 02e4a941..5c5a080b 100644
--- a/test/spec_body_proxy.rb
+++ b/test/spec_body_proxy.rb
@@ -33,7 +33,8 @@ describe Rack::BodyProxy do
   end
 
   should 'not close more than one time' do
-    proxy = Rack::BodyProxy.new([]) { }
+    count = 0
+    proxy = Rack::BodyProxy.new([]) { count += 1; raise "Block invoked more than 1 time!" if count > 1 }
     proxy.close
     lambda {
       proxy.close