summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-17 04:34:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-17 04:34:39 +0000
commit3da93dd84287874fdefe439384efcc3d56d1c07f (patch)
treed6b95b24b724724139a869728f8fb15951685cc8
parent0b2d95aafdf2c41aac34524234fd0727cebf5856 (diff)
* lib/cgi/session.rb (CGI::Session#initialize): control adding
session_id hidden fields. fixed: [ruby-talk:123850] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi/session.rb11
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 461dab7de1..780aa6a864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 17 13:33:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/cgi/session.rb (CGI::Session#initialize): control adding
+ session_id hidden fields. fixed: [ruby-talk:123850]
+
Sun Dec 17 00:01:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_proc_arity, rb_node_arity, rb_mod_method_arity,
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 8384ed9beb..e02da8db38 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -253,15 +253,14 @@ class CGI
end
end
unless session_id
- if request.key?(session_key)
- session_id = request[session_key]
+ if session_id = request[session_key]
session_id = session_id.read if session_id.respond_to?(:read)
end
unless session_id
session_id, = request.cookies[session_key]
end
unless session_id
- if option.key?('new_session') and not option['new_session']
+ unless option.fetch('new_session', true)
raise ArgumentError, "session_key `%s' should be supplied"%session_key
end
session_id = create_new_id
@@ -272,14 +271,14 @@ class CGI
begin
@dbman = dbman::new(self, option)
rescue NoSession
- if option.key?('new_session') and not option['new_session']
+ unless option.fetch('new_session', true)
raise ArgumentError, "invalid session_id `%s'"%session_id
end
session_id = @session_id = create_new_id
retry
end
request.instance_eval do
- @output_hidden = {session_key => session_id}
+ @output_hidden = {session_key => session_id} unless option['no_hidden']
@output_cookies = [
Cookie::new("name" => session_key,
"value" => session_id,
@@ -293,7 +292,7 @@ class CGI
else
""
end)
- ]
+ ] unless option['no_cookies']
end
@dbprot = [@dbman]
ObjectSpace::define_finalizer(self, Session::callback(@dbprot))