From 29e7a0242853a5e102b6846b87723fc26a1ffb08 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 17 Jan 2009 11:12:18 -0600
Subject: Ensure any method sent to RewindableIO reads the original IO object
 [#1767 state:resolved]

---
 actionpack/lib/action_controller/rack_ext/multipart.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/rack_ext/multipart.rb')

diff --git a/actionpack/lib/action_controller/rack_ext/multipart.rb b/actionpack/lib/action_controller/rack_ext/multipart.rb
index 3d6f1f9256..3b142307e9 100644
--- a/actionpack/lib/action_controller/rack_ext/multipart.rb
+++ b/actionpack/lib/action_controller/rack_ext/multipart.rb
@@ -6,8 +6,8 @@ module Rack
           result = parse_multipart_without_rewind(env)
 
           begin
-            env['rack.input'].rewind
-          rescue NoMethodError, Errno::ESPIPE
+            env['rack.input'].rewind if env['rack.input'].respond_to?(:rewind)
+          rescue Errno::ESPIPE
             # Handles exceptions raised by input streams that cannot be rewound
             # such as when using plain CGI under Apache
           end
-- 
cgit v1.2.3