From 8ead07182897bc4f70f2a74833e50ac8ab700fa9 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 14 Mar 2008 08:08:51 +0000 Subject: * lib/cgi.rb (CGI::Cookie::initialize): performance patch from Makoto Kuwata in [ruby-dev:34048]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/cgi.rb | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc916c1a80..d53da7704a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,11 @@ Fri Mar 14 16:59:23 2008 Nobuyoshi Nakada * configure.in (RUBY_LIB_PREFIX): fix for prefix. +Fri Mar 14 16:35:11 2008 Yukihiro Matsumoto + + * lib/cgi.rb (CGI::Cookie::initialize): performance patch from + Makoto Kuwata in [ruby-dev:34048]. + Fri Mar 14 15:49:05 2008 Nobuyoshi Nakada * configure.in (RUBY_LIB_PREFIX): use libdir. diff --git a/lib/cgi.rb b/lib/cgi.rb index 7997a58f4c..538b33380d 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -802,11 +802,16 @@ class CGI # # These keywords correspond to attributes of the cookie object. def initialize(name = "", *value) - options = if name.kind_of?(String) - { "name" => name, "value" => value } - else - name - end + if name.kind_of?(String) + @name = name + @value = value + %r|^(.*/)|.match(ENV["SCRIPT_NAME"]) + @path = ($1 or "") + @secure = false + return super(@value) + end + + options = name unless options.has_key?("name") raise ArgumentError, "`name' required" end @@ -890,7 +895,7 @@ class CGI if cookies.has_key?(name) values = cookies[name].value + values end - cookies[name] = Cookie::new({ "name" => name, "value" => values }) + cookies[name] = Cookie::new(name, *values) end cookies -- cgit v1.2.3