aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/request.rb
diff options
context:
space:
mode:
authorMichael Lovitt <michael@lovitt.net>2010-06-22 09:55:50 -0400
committerJeremy Kemper <jeremy@bitsweat.net>2010-06-23 11:56:35 -0700
commit49f52c3d910c8f183afc3a54ea2ae9667f23085e (patch)
tree410bc3c8fb8921397547c33fd8661f2015065946 /actionpack/lib/action_dispatch/http/request.rb
parent0bf3baa6b3d216c6340f8d3b5d0a3ebc093e969a (diff)
downloadrails-49f52c3d910c8f183afc3a54ea2ae9667f23085e.tar.gz
rails-49f52c3d910c8f183afc3a54ea2ae9667f23085e.tar.bz2
rails-49f52c3d910c8f183afc3a54ea2ae9667f23085e.zip
Sessions should not be created until written to and session data should be destroyed on reset.
[#4938] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 98f4f5ae18..6b611823d0 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -195,7 +195,7 @@ module ActionDispatch
end
def reset_session
- self.session_options.delete(:id)
+ session.destroy if session
self.session = {}
end