aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb8
2 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index ba6c7fa8bc..2a9ced6dc0 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that query params could be forced to nil on a POST due to the raw post fix #562 [moriq@moriq.com]
+
* Fixed that cookies shouldn't be frozen in TestRequest #571 [Eric Hodel]
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 ce6722f3a4..1905fdf9b2 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
@@ -14,7 +14,7 @@ class CGI #:nodoc:
@params = CGI::parse(read_query_params)
end
- @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
+ @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] || env_table['COOKIE']))
end
private
@@ -30,13 +30,13 @@ class CGI #:nodoc:
case env_table['REQUEST_METHOD']
when 'GET', 'HEAD'
if defined? MOD_RUBY
- Apache::request.args or ''
+ Apache::request.args || ''
else
- env_table['QUERY_STRING'] or ''
+ env_table['QUERY_STRING'] || ''
end
when 'POST'
stdinput.binmode if stdinput.respond_to?(:binmode)
- content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
+ content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) || ''
env_table['RAW_POST_DATA'] = content.freeze
else
read_from_cmdline