diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-01-17 11:12:18 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-17 11:12:18 -0600 |
| commit | 29e7a0242853a5e102b6846b87723fc26a1ffb08 (patch) | |
| tree | 6ad8a437d4422ce0247a61ebb03457610fdfded7 /actionpack/lib/action_controller/rack_ext/multipart.rb | |
| parent | 515a1a332808eb7c2f9c006fc1903e1e8555b7fa (diff) | |
| download | rails-29e7a0242853a5e102b6846b87723fc26a1ffb08.tar.gz rails-29e7a0242853a5e102b6846b87723fc26a1ffb08.tar.bz2 rails-29e7a0242853a5e102b6846b87723fc26a1ffb08.zip | |
Ensure any method sent to RewindableIO reads the original IO object [#1767 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/rack_ext/multipart.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rack_ext/multipart.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |