diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-30 10:53:14 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-30 10:53:19 -0800 |
| commit | da10673e32718d6a0619bd0f4b4d3d796db86a1a (patch) | |
| tree | 7bdb7868b0be65daec06ba729f68deccfe61a8bb /actionpack/lib/action_controller/rack_ext.rb | |
| parent | b8fadd708b9850a77e1f64038763fffcff502499 (diff) | |
| parent | ed0e5640879fd42c00fc5900e0355a0ea1dcf2ad (diff) | |
| download | rails-da10673e32718d6a0619bd0f4b4d3d796db86a1a.tar.gz rails-da10673e32718d6a0619bd0f4b4d3d796db86a1a.tar.bz2 rails-da10673e32718d6a0619bd0f4b4d3d796db86a1a.zip | |
Sync 'rails/rails/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' |