aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2012-04-30 16:32:53 +0400
committerbrainopia <brainopia@evilmartians.com>2012-04-30 17:04:17 +0400
commitff2667d21a2c183d031acce44d95d06a8c99c035 (patch)
tree2858b3eb34fdd989938ed6608e3e51d103ebfac3 /actionpack/lib/action_dispatch/middleware
parentdbe5162496623c919457da1db7b5843f3dbe733f (diff)
downloadrails-ff2667d21a2c183d031acce44d95d06a8c99c035.tar.gz
rails-ff2667d21a2c183d031acce44d95d06a8c99c035.tar.bz2
rails-ff2667d21a2c183d031acce44d95d06a8c99c035.zip
Dont set cookie header for deletion of unexisting data
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 9b9227b659..ecb336bb4e 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -182,8 +182,9 @@ module ActionDispatch
# and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
# an options hash to delete cookies with extra data such as a <tt>:path</tt>.
def delete(key, options = {})
- options.symbolize_keys!
+ return unless @cookies.has_key? key.to_s
+ options.symbolize_keys!
handle_options(options)
value = @cookies.delete(key.to_s)