From bffc180590dab3efa0df99c6401a32e04ea1d865 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 20 Feb 2009 10:35:11 +0000 Subject: merge revision(s) 20884: * lib/cgi/session.rb: ignore session_id options fixed.[Bug #605] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/cgi/session.rb | 6 ++++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60b670702d..8be8ead640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 20 19:35:08 2009 Takeyuki FUJIOKA + + * lib/cgi/session.rb: ignore session_id options fixed.[Bug #605] + Fri Feb 20 18:06:40 2009 James Edward Gray II Merged 20854 from trunk. diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index a6e999bc34..2dea08cf75 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -188,7 +188,6 @@ class CGI md5.update('foobar') session_id = md5.hexdigest end - @new_session = true session_id end private :create_new_id @@ -256,6 +255,7 @@ class CGI unless session_id if option['new_session'] session_id = create_new_id + @new_session = true end end unless session_id @@ -271,6 +271,7 @@ class CGI raise ArgumentError, "session_key `%s' should be supplied"%session_key end session_id = create_new_id + @new_session = true end end @session_id = session_id @@ -281,7 +282,8 @@ class CGI unless option.fetch('new_session', true) raise ArgumentError, "invalid session_id `%s'"%session_id end - session_id = @session_id = create_new_id + session_id = @session_id = create_new_id unless session_id + @new_session = true retry end request.instance_eval do diff --git a/version.h b/version.h index b2dafa31a9..6e440a8a18 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-20" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090220 -#define RUBY_PATCHLEVEL 132 +#define RUBY_PATCHLEVEL 133 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3