From 3ed1979de25fad04b2b74bd4e4de13d7edd94b3d Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 Mar 2001 14:50:43 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'v1_6_3'.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_6_3@1265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/cgi/session.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lib/cgi/session.rb')

diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 48f3496939..1120fb50f0 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -1,3 +1,4 @@
+# Copyright (C) 2001  Yukihiro "Matz" Matsumoto
 # Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
 # Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
@@ -15,23 +16,22 @@ class CGI
       }
     end
 
-    def create_new_id
+    def Session::create_new_id
       require 'md5'
       md5 = MD5::new
       md5.update(String(Time::now))
       md5.update(String(rand(0)))
       md5.update(String($$))
       md5.update('foobar')
-      @session_id = md5.hexdigest[0,16]
+      md5.hexdigest[0,16]
     end
-    private :create_new_id
 
     def initialize(request, option={})
       session_key = option['session_key'] || '_session_id'
       id, = option['session_id']
       unless id
 	if option['new_session']
-	  id = create_new_id
+	  id = Session::create_new_id
 	end
       end
       unless id
@@ -43,7 +43,7 @@ class CGI
 	  if option.key?('new_session') and not option['new_session']
 	    raise ArgumentError, "session_key `%s' should be supplied"%session_key
 	  end
-	  id = create_new_id
+	  id = Session::create_new_id
 	end
       end
       @session_id = id
@@ -54,7 +54,9 @@ class CGI
 	@output_cookies =  [
           Cookie::new("name" => session_key,
 		      "value" => id,
-		      "path" => if ENV["SCRIPT_NAME"] then
+		      "path" => if option['session_path'] then
+				  option['session_path']
+		                elsif ENV["SCRIPT_NAME"] then
 				  File::dirname(ENV["SCRIPT_NAME"])
 				else
 				  ""
@@ -132,6 +134,7 @@ class CGI
       end
 
       def close
+	return if @f.closed?
 	update
 	@f.close
       end
-- 
cgit v1.2.3