From 83cb605d69f20be5fe842a913e51d017f61cdc44 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 29 Nov 2004 06:09:40 +0000
Subject: * object.c (convert_type): [ruby-core:03845]

* eval.c (rb_funcall_rescue): new function.

* object.c (rb_Array): avoid using rb_respond_to().

* object.c (rb_Integer): ditto.

* eval.c (get_backtrace): no conversion for nil.

* parse.y (reduce_nodes): empty body should return nil.


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

(limited to 'lib')

diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 5d9e767356..1bddaf3260 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -246,7 +246,7 @@ class CGI
       id = option['session_id']
       unless id
 	if option['new_session']
-	  id = Session::create_new_id
+	  id = create_new_id
 	end
       end
       unless id
@@ -261,7 +261,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 = Session::create_new_id
+	  id = create_new_id
 	end
       end
       @session_id = id
-- 
cgit v1.2.3