aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_ext
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2008-02-12 21:45:39 +0000
committerJamis Buck <jamis@37signals.com>2008-02-12 21:45:39 +0000
commit11787b802a1ea8152507e94940f9af394d343c4c (patch)
tree29ddb960a4d346826115b24a4d7a40bdeea6e52c /actionpack/lib/action_controller/cgi_ext
parent873939013455135dfe751156c7f8c7ad6fbe6b59 (diff)
downloadrails-11787b802a1ea8152507e94940f9af394d343c4c.tar.gz
rails-11787b802a1ea8152507e94940f9af394d343c4c.tar.bz2
rails-11787b802a1ea8152507e94940f9af394d343c4c.zip
remove support for ampersand-delimited cookie values
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8861 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/cgi_ext')
-rw-r--r--actionpack/lib/action_controller/cgi_ext/cookie.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cookie.rb b/actionpack/lib/action_controller/cgi_ext/cookie.rb
index c7ea1b6443..3dd374f126 100644
--- a/actionpack/lib/action_controller/cgi_ext/cookie.rb
+++ b/actionpack/lib/action_controller/cgi_ext/cookie.rb
@@ -90,12 +90,11 @@ class CGI #:nodoc:
if raw_cookie
raw_cookie.split(/;\s?/).each do |pairs|
- name, values = pairs.split('=',2)
- next unless name and values
+ name, value = pairs.split('=',2)
+ next unless name and value
name = CGI::unescape(name)
- values = values.split('&').collect!{|v| CGI::unescape(v) }
unless cookies.has_key?(name)
- cookies[name] = new(name, *values)
+ cookies[name] = new(name, CGI::unescape(value))
end
end
end