Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Back out of 3109 for now as it seems to interfere with the flash

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3150 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit d345b7a4f0b9fb957afa9fc1fcff0a50321a553d 1 parent baad1c4
@dhh dhh authored
Showing with 2 additions and 6 deletions.
  1. +2 −6 actionpack/lib/action_controller/cgi_process.rb
View
8 actionpack/lib/action_controller/cgi_process.rb
@@ -93,7 +93,7 @@ def port_from_http_host
def session
unless @session
if @session_options == false
- @session = disabled_session_hash
+ @session = Hash.new
else
stale_session_check! do
if session_options_with_string_keys['new_session'] == true
@@ -121,17 +121,13 @@ def method_missing(method_id, *arguments)
# Delete an old session if it exists then create a new one.
def new_session
if @session_options == false
- disabled_session_hash
+ Hash.new
else
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => false)).delete rescue nil
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
end
end
- def disabled_session_hash
- Hash.new { |h,k| raise "You disabled sessions but are attempting to set session[#{k.inspect}]" }
- end
-
def stale_session_check!
yield
rescue ArgumentError => argument_error
Please sign in to comment.
Something went wrong with that request. Please try again.