aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/session
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-05 19:28:52 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-05 19:28:52 -0700
commit29a06f10e8600bbda333c30bf294e7896f35b8d5 (patch)
tree979660db690128aa9767ce395b644478cf82de07 /actionpack/lib/action_controller/session
parent69e9cbb99ab111ad6b9cb2c9d8ba823ad8600bd6 (diff)
downloadrails-29a06f10e8600bbda333c30bf294e7896f35b8d5.tar.gz
rails-29a06f10e8600bbda333c30bf294e7896f35b8d5.tar.bz2
rails-29a06f10e8600bbda333c30bf294e7896f35b8d5.zip
Strip newlines from cookie session data
Diffstat (limited to 'actionpack/lib/action_controller/session')
-rw-r--r--actionpack/lib/action_controller/session/cookie_store.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb
index b477c1f7da..5bf7503f04 100644
--- a/actionpack/lib/action_controller/session/cookie_store.rb
+++ b/actionpack/lib/action_controller/session/cookie_store.rb
@@ -129,7 +129,7 @@ class CGI::Session::CookieStore
private
# Marshal a session hash into safe cookie data. Include an integrity hash.
def marshal(session)
- data = ActiveSupport::Base64.encode64(Marshal.dump(session)).chop
+ data = ActiveSupport::Base64.encode64s(Marshal.dump(session))
"#{data}--#{generate_digest(data)}"
end