diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-10 12:28:41 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-10 12:28:41 -0800 |
| commit | b04fe4c539633ff40deca8729d010accc24aa019 (patch) | |
| tree | d46160cbe275fe756961537edc4cdc9311a474ec /actionpack/lib/action_dispatch/http | |
| parent | 287a8d878ce18da401cbcc57c718a43c16e1494e (diff) | |
| parent | bc254cc23558f016c3697ecd5d39e58f46908018 (diff) | |
| download | rails-b04fe4c539633ff40deca8729d010accc24aa019.tar.gz rails-b04fe4c539633ff40deca8729d010accc24aa019.tar.bz2 rails-b04fe4c539633ff40deca8729d010accc24aa019.zip | |
Merge pull request #8476 from sheerun/fix/multipart-get
Prevent raising EOFError on multipart GET request.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/parameters.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb index 9a7b5bc8c7..6610315da7 100644 --- a/actionpack/lib/action_dispatch/http/parameters.rb +++ b/actionpack/lib/action_dispatch/http/parameters.rb @@ -12,7 +12,11 @@ module ActionDispatch # Returns both GET and POST \parameters in a single hash. def parameters @env["action_dispatch.request.parameters"] ||= begin - params = request_parameters.merge(query_parameters) + params = begin + request_parameters.merge(query_parameters) + rescue EOFError + query_parameters.dup + end params.merge!(path_parameters) encode_params(params).with_indifferent_access end |