diff options
| author | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-21 22:18:10 -0500 |
|---|---|---|
| committer | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-21 22:18:10 -0500 |
| commit | f08a78a057782577d5efbc82662d7898e26dcb8c (patch) | |
| tree | d0638cf1d180ed3713ecafcf36ea1df9bc5eeb7a /actionpack/lib/action_controller/rack_ext.rb | |
| parent | c5069bd4951419ea02aea35ac5c121bc0c311940 (diff) | |
| parent | e8f7da6118936af2d145b3c025db4b4dcd0b3308 (diff) | |
| download | rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.gz rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.bz2 rails-f08a78a057782577d5efbc82662d7898e26dcb8c.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
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' |