aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-01-04 12:15:15 -0600
committerJoshua Peek <josh@joshpeek.com>2009-01-04 12:15:15 -0600
commitf00e86d7e9c7a4689a49fc085bcb757c5a2c0b03 (patch)
tree0acd5b9b645d658dcf2ceaced995df5b1483188c /actionpack/lib/action_controller/base.rb
parented2e776bdec3f0764433a6dc4f592f9bebfea859 (diff)
downloadrails-f00e86d7e9c7a4689a49fc085bcb757c5a2c0b03.tar.gz
rails-f00e86d7e9c7a4689a49fc085bcb757c5a2c0b03.tar.bz2
rails-f00e86d7e9c7a4689a49fc085bcb757c5a2c0b03.zip
Memoize request accessors on the Rack env so other request objects have access to the same cache [#1668 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index aa604395a9..1093a9bc04 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -384,8 +384,8 @@ module ActionController #:nodoc:
class << self
def call(env)
# HACK: For global rescue to have access to the original request and response
- request = env["actioncontroller.rescue.request"] ||= Request.new(env)
- response = env["actioncontroller.rescue.response"] ||= Response.new
+ request = env["action_controller.rescue.request"] ||= Request.new(env)
+ response = env["action_controller.rescue.response"] ||= Response.new
process(request, response)
end