diff options
Diffstat (limited to 'actionpack/lib/action_controller/session')
| -rw-r--r-- | actionpack/lib/action_controller/session/cookie_store.rb | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | actionpack/lib/action_controller/session/drb_server.rb | 14 |
2 files changed, 8 insertions, 8 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 diff --git a/actionpack/lib/action_controller/session/drb_server.rb b/actionpack/lib/action_controller/session/drb_server.rb index 6f90db6747..2caa27f62a 100644..100755 --- a/actionpack/lib/action_controller/session/drb_server.rb +++ b/actionpack/lib/action_controller/session/drb_server.rb @@ -1,8 +1,8 @@ -#!/usr/local/bin/ruby -w - -# This is a really simple session storage daemon, basically just a hash, +#!/usr/bin/env ruby + +# This is a really simple session storage daemon, basically just a hash, # which is enabled for DRb access. - + require 'drb' session_hash = Hash.new @@ -14,13 +14,13 @@ class <<session_hash super(key, value) end end - + def [](key) @mutex.synchronize do super(key) end end - + def delete(key) @mutex.synchronize do super(key) @@ -29,4 +29,4 @@ class <<session_hash end DRb.start_service('druby://127.0.0.1:9192', session_hash) -DRb.thread.join
\ No newline at end of file +DRb.thread.join |