From b0fc5e541e1c55f9ec89aec5d0dd31178f6fbec9 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 20 Feb 2009 10:34:45 +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_6@22463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/cgi/session.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3