Since upgrading rack we can remove unnecessary string encodings

https://github.com/rack/rack/commit/5a5aee36

1 files changed, 2 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index dcb299ed03..378dbf6354 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -50,23 +50,16 @@ module ActionDispatch
 
     private
 
-      # Convert nested Hash to HashWithIndifferentAccess
-      # and UTF-8 encode both keys and values in nested Hash.
+      # Convert nested Hash to HashWithIndifferentAccess.
       #
-      # TODO: Validate that the characters are UTF-8. If they aren't,
-      # you'll get a weird error down the road, but our form handling
-      # should really prevent that from happening
       def normalize_encode_params(params)
         case params
-        when String
-          params.force_encoding(Encoding::UTF_8).encode!
         when Hash
           if params.has_key?(:tempfile)
             UploadedFile.new(params)
           else
             params.each_with_object({}) do |(key, val), new_hash|
-              new_key = key.is_a?(String) ? key.dup.force_encoding(Encoding::UTF_8).encode! : key
-              new_hash[new_key] = if val.is_a?(Array)
+              new_hash[key] = if val.is_a?(Array)
                 val.map! { |el| normalize_encode_params(el) }
               else
                 normalize_encode_params(val)