diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-17 14:55:06 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-17 14:55:06 +0000 |
| commit | cc24eb85189fe811f4cdd01b5ba070461d5c376a (patch) | |
| tree | f9f584f2fdee93f39c2aa9f0999be3f5de753b90 /lib | |
| parent | 6fca2beac718e5168dd7c6cebf2a29f94a30c4b0 (diff) | |
* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
cookie name. [ruby-talk:156140]
* string.c (rb_str_substr): should propagate taintness even for
empty strings. [ruby-dev:27121]
* string.c (rb_str_aref): should infect result if range argument
is tainted. [ruby-dev:27121]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 7c84f64640..b18a03524c 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -870,15 +870,16 @@ class CGI cookies = Hash.new([]) return cookies unless raw_cookie - raw_cookie.split(/; /).each do |pairs| + raw_cookie.split(/[;,] /).each do |pairs| name, values = pairs.split('=',2) next unless name and values name = CGI::unescape(name) values ||= "" values = values.split('&').collect{|v| CGI::unescape(v) } - unless cookies.has_key?(name) - cookies[name] = Cookie::new({ "name" => name, "value" => values }) + if cookies.has_key?(name) + values = cookies[name].value + values end + cookies[name] = Cookie::new({ "name" => name, "value" => values }) end cookies |