shyouhei	2009-02-20 19:35:11 +0900 (Fri, 20 Feb 2009)

  New Revision: 22465

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22465

  Log:
    merge revision(s) 20884:
    * lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/cgi/session.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22464)
+++ ruby_1_8_7/ChangeLog	(revision 22465)
@@ -1,3 +1,7 @@
+Fri Feb 20 19:35:08 2009  Takeyuki FUJIOKA  <xibbar@r...>
+
+	* lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]
+
 Fri Feb 20 18:06:40 2009  James Edward Gray II  <jeg2@r...>
 
 	Merged 20854 from trunk.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22464)
+++ ruby_1_8_7/version.h	(revision 22465)
@@ -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
Index: ruby_1_8_7/lib/cgi/session.rb
===================================================================
--- ruby_1_8_7/lib/cgi/session.rb	(revision 22464)
+++ ruby_1_8_7/lib/cgi/session.rb	(revision 22465)
@@ -188,7 +188,6 @@
         md5.update('foobar')
         session_id = md5.hexdigest
       end
-      @new_session = true
       session_id
     end
     private :create_new_id
@@ -256,6 +255,7 @@
       unless session_id
 	if option['new_session']
 	  session_id = create_new_id
+      @new_session = true
 	end
       end
       unless session_id
@@ -271,6 +271,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
@@ -281,7 +282,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/