diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index eb4c5f4088..54fc1e72b8 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update CGI process to allow sessions to contain namespaced models. Closes #4638. [dfelstead@site5.com] + * Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. [Nicholas Seckar] * Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability. #3368, #6226 [sdsykes, fhanshaw@vesaria.com] diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 5a08171ef2..50cf93defe 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -141,7 +141,7 @@ module ActionController #:nodoc: def stale_session_check! yield rescue ArgumentError => argument_error - if argument_error.message =~ %r{undefined class/module (\w+)} + if argument_error.message =~ %r{undefined class/module ([\w:]+)} begin Module.const_missing($1) rescue LoadError, NameError => const_error |