diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-18 17:45:39 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-18 17:45:39 +0000 |
| commit | aeafccf0ca2b7596a0b08c275d2c2154992fe573 (patch) | |
| tree | c0ab58cbfe0defc8e1078044e83d687d465d4d14 /actionpack/lib/action_controller/rack_ext.rb | |
| parent | e35e5ed2a4c87a10c70aa6b87a411182ce967c21 (diff) | |
| parent | 085991891e610ed0ab616ce434eabf42a9437039 (diff) | |
| download | rails-aeafccf0ca2b7596a0b08c275d2c2154992fe573.tar.gz rails-aeafccf0ca2b7596a0b08c275d2c2154992fe573.tar.bz2 rails-aeafccf0ca2b7596a0b08c275d2c2154992fe573.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/rack_ext.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rack_ext.rb | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/actionpack/lib/action_controller/rack_ext.rb b/actionpack/lib/action_controller/rack_ext.rb index 3b142307e9..2ba6654e3d 100644 --- a/actionpack/lib/action_controller/rack_ext.rb +++ b/actionpack/lib/action_controller/rack_ext.rb @@ -1,22 +1,3 @@ -module Rack - module Utils - module Multipart - class << self - def parse_multipart_with_rewind(env) - result = parse_multipart_without_rewind(env) - - begin - 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 - - result - end - - alias_method_chain :parse_multipart, :rewind - end - end - end -end +require 'action_controller/rack_ext/lock' +require 'action_controller/rack_ext/multipart' +require 'action_controller/rack_ext/parse_query' |