diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-02 08:42:00 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-02 08:42:00 +0000 |
| commit | 77e98ee776ad6ac4d805711a8e244a8fb8633784 (patch) | |
| tree | d99173b640344ad952fd63599c3b5d358ac4814e /lib | |
| parent | 931c7def3536cb1e4b48a3eb8040446e98527e6d (diff) | |
| download | ruby-77e98ee776ad6ac4d805711a8e244a8fb8633784.tar.gz ruby-77e98ee776ad6ac4d805711a8e244a8fb8633784.tar.xz ruby-77e98ee776ad6ac4d805711a8e244a8fb8633784.zip | |
* lib/cgi/session.rb (CGI::Session::initialize): updated to
support 2003-04-23 change in cgi.rb [ruby-core:1002]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi/session.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index 79ee0e3fe..930650823 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -27,15 +27,17 @@ class CGI def initialize(request, option={}) session_key = option['session_key'] || '_session_id' - id, = option['session_id'] + id = option['session_id'] unless id if option['new_session'] id = Session::create_new_id end end unless id - id, = request[session_key] - id = id.read if id.respond_to?(:read) + if request.key?(session_key) + id = request[session_key] + id = id.read if id.respond_to?(:read) + end unless id id, = request.cookies[session_key] end |