aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-06-30 05:41:03 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-06-30 05:41:03 +0000
commitd0526ede40c1ebe4b1bcd9d5efbc04254f4c8cbf (patch)
treeb24c460ef018b736be457d0d88c2c5b7ee60827a /actionpack
parent5446ecd5b975890dab5f7120b25ed0e8f91279fa (diff)
downloadrails-d0526ede40c1ebe4b1bcd9d5efbc04254f4c8cbf.tar.gz
rails-d0526ede40c1ebe4b1bcd9d5efbc04254f4c8cbf.tar.bz2
rails-d0526ede40c1ebe4b1bcd9d5efbc04254f4c8cbf.zip
r4748@asus: jeremy | 2006-06-29 22:40:35 -0700
Loosen urlencoded content type check. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4524 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb2
-rw-r--r--actionpack/test/controller/raw_post_test.rb2
2 files changed, 2 insertions, 2 deletions
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
index 1b275501cb..4be69548fd 100644
--- 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 @@ class CGI #:nodoc:
if boundary = extract_multipart_form_boundary(content_type)
@multipart = true
@params = read_multipart(boundary, content_length)
- elsif content_type.blank? || content_type.downcase !~ %r{^application/x-www-form-urlencoded.*}
+ elsif content_type.blank? || content_type !~ %r{application/x-www-form-urlencoded}i
read_params(method, content_length)
@params = {}
end
diff --git a/actionpack/test/controller/raw_post_test.rb b/actionpack/test/controller/raw_post_test.rb
index b6895bc3cc..c9816484b7 100644
--- a/actionpack/test/controller/raw_post_test.rb
+++ b/actionpack/test/controller/raw_post_test.rb
@@ -11,7 +11,7 @@ class RawPostDataTest < Test::Unit::TestCase
def test_post_with_urlencoded_body
ENV['REQUEST_METHOD'] = 'POST'
- ENV['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'
+ ENV['CONTENT_TYPE'] = ' apPlication/x-Www-form-urlEncoded; charset=utf-8'
assert_equal ['1'], cgi_params['a']
assert_has_raw_post_data
end