diff options
Diffstat (limited to 'lib/cgi')
-rw-r--r-- | lib/cgi/session.rb | 16 | ||||
-rw-r--r-- | lib/cgi/session/pstore.rb | 17 |
2 files changed, 10 insertions, 23 deletions
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index 2bb6571bf6..d2a1be4aab 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -301,20 +301,14 @@ class CGI # Retrieve the session data for key +key+. def [](key) - unless @data - @data = @dbman.restore - end + @data ||= @dbman.restore @data[key] end # Set the session date for key +key+. def []=(key, val) - unless @write_lock - @write_lock = true - end - unless @data - @data = @dbman.restore - end + @write_lock ||= true + @data ||= @dbman.restore @data[key] = val end @@ -380,7 +374,9 @@ class CGI require 'digest/md5' md5 = Digest::MD5.hexdigest(id)[0,16] @path = dir+"/"+prefix+md5+suffix - unless File::exist? @path + if File::exist? @path + @hash = nil + else unless session.new_session raise CGI::Session::NoSession, "uninitialized session" end diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb index a4ef0cbdcb..9a16a66b15 100644 --- a/lib/cgi/session/pstore.rb +++ b/lib/cgi/session/pstore.rb @@ -14,17 +14,6 @@ require 'pstore' class CGI class Session - def []=(key, val) - unless @write_lock - @write_lock = true - end - unless @data - @data = @dbman.restore - end - #@data[key] = String(val) - @data[key] = val - end - # PStore-based session storage class. # # This builds upon the top-level PStore class provided by the @@ -53,7 +42,7 @@ class CGI # # This session's PStore file will be created if it does # not exist, or opened if it does. - def initialize session, option={} + def initialize(session, option={}) dir = option['tmpdir'] || Dir::tmpdir prefix = option['prefix'] || '' id = session.session_id @@ -61,7 +50,9 @@ class CGI md5 = Digest::MD5.hexdigest(id)[0,16] path = dir+"/"+prefix+md5 path.untaint - unless File::exist?(path) + if File::exist?(path) + @hash = nil + else unless session.new_session raise CGI::Session::NoSession, "uninitialized session" end |