Navigation

Changeset 5823

Timestamp:

01/01/07 01:30:28 (2 years ago)

Author:

bitsweat

Message:

Merge [5822] from 1.2 (oops, wrong order).

Files:

r5820	r5823
108	108	else
109	109	stale_session_check! do
110		if session_options_with_string_keys['new_session'] == true
111		@session = new_session
112		else
113		begin
	110	case value = session_options_with_string_keys['new_session']
	111	when true
	112	@session = new_session
	113	when false
	114	begin
	115	@session = CGI::Session.new(@cgi, session_options_with_string_keys)
	116	# CGI::Session raises ArgumentError if 'new_session' == false
	117	# and no session cookie or query param is present.
	118	rescue ArgumentError
	119	@session = Hash.new
	120	end
	121	when nil
114	122	@session = CGI::Session.new(@cgi, session_options_with_string_keys)
115		# CGI::Session raises ArgumentError if 'new_session' == false
116		# and no session cookie or query param is present.
117		rescue ArgumentError
118		@session = Hash.new
119		end
	123	else
	124	raise ArgumentError, "Invalid new_session option: #{value}"
120	125	end
121	126	@session['__valid_session']