ruby-changes:10890
From: shyouhei <ko1@a...>
Date: Fri, 20 Feb 2009 19:34:56 +0900 (JST)
Subject: [ruby-changes:10890] Ruby:r22463 (ruby_1_8_6): merge revision(s) 20884:
shyouhei 2009-02-20 19:34:45 +0900 (Fri, 20 Feb 2009) New Revision: 22463 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22463 Log: merge revision(s) 20884: * lib/cgi/session.rb: ignore session_id options fixed.[Bug #605] Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/cgi/session.rb branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22462) +++ ruby_1_8_6/ChangeLog (revision 22463) @@ -1,3 +1,7 @@ +Fri Feb 20 19:34:36 2009 Takeyuki FUJIOKA <xibbar@r...> + + * lib/cgi/session.rb: ignore session_id options fixed.[Bug #605] + Fri Feb 20 18:05:27 2009 James Edward Gray II <jeg2@r...> Merged 20854 from trunk. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22462) +++ ruby_1_8_6/version.h (revision 22463) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-20" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090220 -#define RUBY_PATCHLEVEL 345 +#define RUBY_PATCHLEVEL 346 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/lib/cgi/session.rb =================================================================== --- ruby_1_8_6/lib/cgi/session.rb (revision 22462) +++ ruby_1_8_6/lib/cgi/session.rb (revision 22463) @@ -182,7 +182,6 @@ md5.update(String(rand(0))) md5.update(String($$)) md5.update('foobar') - @new_session = true md5.hexdigest end private :create_new_id @@ -250,6 +249,7 @@ unless session_id if option['new_session'] session_id = create_new_id + @new_session = true end end unless session_id @@ -265,6 +265,7 @@ 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 @@ -275,7 +276,8 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/