1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb
index 626a2ce814..1eb071bdbe 100644
--- a/actionpack/lib/action_controller/cookies.rb
+++ b/actionpack/lib/action_controller/cookies.rb
@@ -44,7 +44,7 @@ module ActionController #:nodoc:
         options.each { |key, value| options[key.to_s] = value }
         options["name"] = name.to_s
       else
-        options = [ name, options ]
+        options = { "name" => name, "value" => options }
       end
       
       set_cookie(name, options)
@@ -57,7 +57,8 @@ module ActionController #:nodoc:
 
     private
       def set_cookie(name, options) #:doc:
-        cookie = options.is_a?(Array) ? CGI::Cookie.new(*options) : CGI::Cookie.new(options)
+        options["path"] = "/" unless options["path"]
+        cookie = CGI::Cookie.new(options)
         @controller.logger.info "Cookie set: #{cookie}" unless @controller.logger.nil?
         @controller.response.headers["cookie"] << cookie
       end