kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Explicitly read as binary in multipart_body for Windows [#1065 state:resolved]

Browse source 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
This commit is contained in:
Bryan Ash 2009-01-13 14:42:43 -06:00 committed by Joshua Peek
parent d3107ce3b0
commit 5a43908c74
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/integration.rb
View file

@ -431,7 +431,7 @@ module ActionController
def multipart_body(params, boundary)
multipart_requestify(params).map do |key, value|
if value.respond_to?(:original_filename)
File.open(value.path) do |f|
File.open(value.path, "rb") do |f|
f.set_encoding(Encoding::BINARY) if f.respond_to?(:set_encoding)
<<-EOF

14
actionpack/test/controller/request/multipart_params_parsing_test.rb
View file

@ -3,11 +3,10 @@ require 'abstract_unit'
class MultipartParamsParsingTest < ActionController::IntegrationTest
class TestController < ActionController::Base
class << self
attr_accessor :last_request_parameters, :last_request_type
attr_accessor :last_request_parameters
end
def parse
self.class.last_request_type = ActionController::Base.param_parsers[request.content_type]
self.class.last_request_parameters = request.request_parameters
head :ok
end
@ -21,7 +20,6 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
def teardown
TestController.last_request_parameters = nil
TestController.last_request_type = nil
end
test "parses single parameter" do
@ -103,11 +101,13 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
assert_equal 19756, files.size
end
test "uploads and parses parameters" do
test "uploads and reads binary file" do
with_test_routing do
params = { :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/mona_lisa.jpg", "image/jpg") }
post '/parse', params, :location => 'blah'
assert_equal(:multipart_form, TestController.last_request_type)
fixture = FIXTURE_PATH + "/mona_lisa.jpg"
params = { :uploaded_data => fixture_file_upload(fixture, "image/jpg") }
post '/read', params
expected_length = 'File: '.length + File.size(fixture)
assert_equal expected_length, response.content_length
end
end