aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-06-28 13:51:25 +0000
committerMarcel Molina <marcel@vernix.org>2006-06-28 13:51:25 +0000
commitc02d1f7d9b73f708d8f656044b096454344ccb78 (patch)
tree2d28c2950159a2e627e38eb435591bdc72fe4a7b
parent68a320ad2047c483b4b07cd51c5043cdef562adb (diff)
downloadrails-c02d1f7d9b73f708d8f656044b096454344ccb78.tar.gz
rails-c02d1f7d9b73f708d8f656044b096454344ccb78.tar.bz2
rails-c02d1f7d9b73f708d8f656044b096454344ccb78.zip
Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [mislav@nippur.irb.hr]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 9cb766e183..4a1f42d72f 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [mislav@nippur.irb.hr]
+
* Determine the correct template_root for deeply nested components. #2841 [s.brink@web.de]
* Fix that routes with *path segments in the recall can generate URLs. [Rick]
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 e7de428a9f..1204c57f00 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.downcase != 'application/x-www-form-urlencoded'
+ elsif content_type.blank? || content_type.downcase != 'application/x-www-form-urlencoded'
read_params(method, content_length)
@params = {}
end