Fixed proper form-encoded parameter parsing for requests with "Conten…

…t-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4522 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jun 30, 2006 · bdac94e · bdac94e
1 parent 6a1a1e5
commit bdac94e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [DHH]
+
 * Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. [Nicholas Seckar]
 
 * Avoid naming collision among compiled view methods. [Jeremy Kemper]

diff --git a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
@@ -36,7 +36,7 @@ def initialize_query
         if boundary = extract_multipart_form_boundary(content_type)
           @multipart = true
           @params = read_multipart(boundary, content_length)
-        elsif content_type.blank? || content_type.downcase != 'application/x-www-form-urlencoded'
+        elsif content_type.blank? || content_type.downcase !~ %r{^application/x-www-form-urlencoded.*}
           read_params(method, content_length)
           @params = {}
         end