Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5820

Show
Ignore:
Timestamp:
01/01/07 01:13:09 (2 years ago)
Author:
bitsweat
Message:

Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r5803 r5820  
    11*SVN* 
     2 
     3* Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.  [Josh Susser] 
    24 
    35* Routing uses URI escaping for path components and CGI escaping for query parameters.  [darix, Jeremy Kemper] 

  • trunk/actionpack/lib/action_controller/cgi_process.rb

    r5622 r5820  
    111111              @session = new_session 
    112112            else 
    113               @session = CGI::Session.new(@cgi, session_options_with_string_keys) 
     113              begin 
     114                @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 
    114120            end 
    115121            @session['__valid_session']