Permalink
Browse files

Merge pull request #8476 from sheerun/fix/multipart-get

Prevent raising EOFError on multipart GET request.
  • Loading branch information...
2 parents 287a8d8 + bc254cc commit b04fe4c539633ff40deca8729d010accc24aa019 @rafaelfranca rafaelfranca committed Dec 10, 2012
View
@@ -749,4 +749,6 @@
* `ActionView::Helpers::TextHelper#highlight` now defaults to the
HTML5 `mark` element. *Brian Cardarella*
+* Prevent raising EOFError on multipart GET request (IE issue). *Adam Stankiewicz*
+
Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionpack/CHANGELOG.md) for previous changes.
@@ -12,7 +12,11 @@ def initialize(env)
# 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
@@ -123,6 +123,18 @@ def teardown
end
end
+ # This can happen in Internet Explorer when redirecting after multipart form submit.
+ test "does not raise EOFError on GET request with multipart content-type" do
+ with_routing do |set|
+ set.draw do
+ get ':action', to: 'multipart_params_parsing_test/test'
+ end
+ headers = { "CONTENT_TYPE" => "multipart/form-data; boundary=AaB03x" }
+ get "/parse", {}, headers
+ assert_response :ok
+ end
+ end
+
private
def fixture(name)
File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|

0 comments on commit b04fe4c

Please sign in to comment.