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_6@22463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f0767e347..ee4e5b27d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 20 19:34:36 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]
+
 Fri Feb 20 18:05:27 2009  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	Merged 20854 from trunk.
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 5568b28dce..c148bf248a 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -182,7 +182,6 @@ class CGI
       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 @@ class CGI
       unless session_id
 	if option['new_session']
 	  session_id = create_new_id
+      @new_session = true
 	end
       end
       unless session_id
@@ -265,6 +265,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
@@ -275,7 +276,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 f63491f09a..9ad32cff15 100644
--- a/version.h
+++ b/version.h
@@ -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