diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 8 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index bcc3dd900..fc16ead67 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 diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 1ac5f25f0..16459d7c6 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -554,7 +554,7 @@ module Net raise TimeoutError, "timed out while waiting for more data" end begin - c = @sock.sysread(1024 * 1024) + c = @sock.readpartial(1024 * 1024) @dumplog.log_dump('<', c) if @options.has_key?("Dump_log") if @options["Telnetmode"] c = rest + c |