diff options
author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-05 15:38:04 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-05 15:38:25 -0800 |
commit | b12f194c396b5d279986dd16a3b2caa360e64d19 (patch) | |
tree | e93dc34627404a3b69ff4b223e128884941f7d0a /actionpack/lib/action_controller/metal.rb | |
parent | b0dfd1d19b83f1812317345a68c6bc1ad590be53 (diff) | |
download | rails-b12f194c396b5d279986dd16a3b2caa360e64d19.tar.gz rails-b12f194c396b5d279986dd16a3b2caa360e64d19.tar.bz2 rails-b12f194c396b5d279986dd16a3b2caa360e64d19.zip |
Update AC::Middleware to play better with the normal AC::Metal stack. This required stopping to use #call for non-rack-related stuff
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 6f89bf5d67..60b3f9a89b 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -49,7 +49,7 @@ module ActionController # and response object available. You might wish to control the # environment and response manually for performance reasons. - attr_internal :status, :headers, :content_type, :app, :response + attr_internal :status, :headers, :content_type, :response def initialize(*) @_headers = {} @@ -69,7 +69,7 @@ module ActionController end # :api: private - def call(name, env) + def dispatch(name, env) @_env = env process(name) to_a @@ -95,7 +95,7 @@ module ActionController end def call(env) - controller = @controller.new.call(@action, env) + @controller.new.dispatch(@action, env) end end |