Bump Rack to 1.0.1. Ensure integration test input is ASCII.

rails · Nov 9, 2009 · fd0289f · fd0289f
1 parent a3e129f
commit fd0289f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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,