summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi/session.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index baa6486a0f..3e473a48a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 20 03:30:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/cgi/session.rb (CGI::Session#initialize): empty session id was
+ used if request had no session key. fixed: [ruby-core:03981]
+
Mon Dec 20 00:16:54 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/encodings/SHIFT_JIS.rb: fixed LoadError bug.
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index e02da8db38..8741799390 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -253,7 +253,8 @@ class CGI
end
end
unless session_id
- if session_id = request[session_key]
+ if request.key?(session_key)
+ session_id = request[session_key]
session_id = session_id.read if session_id.respond_to?(:read)
end
unless session_id