From fd0289f3ddf16ca08d6e9510dbf1a7e3ef4126df Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 9 Nov 2009 11:21:12 -0800 Subject: [PATCH] Bump Rack to 1.0.1. Ensure integration test input is ASCII. --- actionpack/lib/action_controller.rb | 2 +- actionpack/lib/action_controller/integration.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index a59dd76a37506..7072aad988467 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -31,7 +31,7 @@ end end -gem 'rack', '~> 1.0.0' +gem 'rack', '~> 1.0.1' require 'rack' require 'action_controller/cgi_ext' diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index f0c165c16e46a..4bca504c7c5ee 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -269,7 +269,9 @@ def process(method, path, parameters = nil, headers = nil) env["QUERY_STRING"] ||= "" - data = data.is_a?(IO) ? data : StringIO.new(data || '') + data ||= '' + data.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding) + data = data.is_a?(IO) ? data : StringIO.new(data) env.update( "REQUEST_METHOD" => method.to_s.upcase,