aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-14 16:18:24 -0500
committerCarl Lerche & Yehuda Katz <wycats@gmail.com>2009-04-14 18:32:31 -0700
commitd7751036fa0af56b31a1d1350284fa86c0f93971 (patch)
tree3a63adfc88117b8fd9e1167d7f5c7e114341da4c /actionpack/lib/action_controller
parentcf44788b06501c8679cb1d26515455d2145d4914 (diff)
downloadrails-d7751036fa0af56b31a1d1350284fa86c0f93971.tar.gz
rails-d7751036fa0af56b31a1d1350284fa86c0f93971.tar.bz2
rails-d7751036fa0af56b31a1d1350284fa86c0f93971.zip
Final blow to CGI
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/dispatch/dispatcher.rb17
1 files changed, 3 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
index bb9d8bd063..091cc49412 100644
--- a/actionpack/lib/action_controller/dispatch/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb
@@ -66,8 +66,7 @@ module ActionController
define_callbacks :prepare_dispatch, :before_dispatch, :after_dispatch
def initialize
- @app = @@middleware.build(lambda { |env| self._call(env) })
- freeze
+ @app = @@middleware.build(lambda { |env| self.dup._call(env) })
end
def call(env)
@@ -75,18 +74,8 @@ module ActionController
end
def _call(env)
- begin
- run_callbacks :before_dispatch
- Routing::Routes.call(env)
- rescue Exception => exception
- if controller ||= (::ApplicationController rescue Base)
- controller.call_with_exception(env, exception).to_a
- else
- raise exception
- end
- ensure
- run_callbacks :after_dispatch, :enumerator => :reverse_each
- end
+ @env = env
+ dispatch
end
def flush_logger