diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-16 03:09:51 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-16 03:09:51 +0000 |
| commit | 1b644555aee0692006c3f4efaae16e5e0f9160e9 (patch) | |
| tree | 857ab2102956ce268a9a63216c11e4bc14a88821 /lib/cgi.rb | |
| parent | 8b02984629490751af2a4cb0a9bc0b48ceaf1bdb (diff) | |
| download | ruby-1b644555aee0692006c3f4efaae16e5e0f9160e9.tar.gz | |
* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
comment (//). [ruby-core:05793]
* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
readpartial. [ruby-talk:127641]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi.rb')
| -rw-r--r-- | lib/cgi.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index bcc3dd9001..fc16ead671 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -880,15 +880,17 @@ 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 + p [name, 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 |