@@ -64,6 +64,9 @@ module Merb def delete(name, options = {}) cookie = @_cookies.delete(name) options = Mash.new(options) + if domain = options[:domain] || Merb::Controller._session_cookie_domain + options[:domain] = domain + end options[:expires] = Time.at(0) set_cookie(name, "", options) Merb.logger.info("Cookie deleted: #{name} => #{cookie.inspect}") @@ -80,6 +83,9 @@ module Merb # :expires<Time>:: Cookie expiry date. def set_cookie(name, value, options) options[:path] = '/' unless options[:path] + if domain = options[:domain] || Merb::Controller._session_cookie_domain + options[:domain] = domain + end if expiry = options[:expires] options[:expires] = expiry.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT) end lib/merb-core/dispatch/cookies.rb 4813273a78309d0578c4b9d208acf9b221899b01 Matthew Windwer matt@reframeit.com http://github.com/reframeit/merb-core/commit/2206d1a5cce8114c80403912a5f3b77897ae96a0 2206d1a5cce8114c80403912a5f3b77897ae96a0 2008-07-30T11:42:02-07:00 2008-07-30T11:42:02-07:00 honor cookie domain when setting and deleting cookies 99b2f3f55b2e4d601348df8a98812ac19bf49afe Matthew Windwer matt@reframeit.com