Fixed that query params could be forced to nil on a POST due to the raw post fix #562 [moriq@moriq.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@526 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-02-07 14:23:19 +00:00
parent 098fa94356
commit b8e4c78abb
2 changed files with 6 additions and 4 deletions

View File

@@ -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]

View File

@@ -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