aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base/base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-02 23:02:22 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-02 23:02:22 -0500
commit11af089cee0a0e744e267d32becfe2c66a586d31 (patch)
tree970e6172381f5f246ffbb48b3b46c5393d56a7ec /actionpack/lib/action_controller/base/base.rb
parent1c6fcbfd2d67ce2b2faa29d956566b48e9a61188 (diff)
downloadrails-11af089cee0a0e744e267d32becfe2c66a586d31.tar.gz
rails-11af089cee0a0e744e267d32becfe2c66a586d31.tar.bz2
rails-11af089cee0a0e744e267d32becfe2c66a586d31.zip
Extract ActionController rescue templates into Rescue and ShowExceptions middleware.
This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
Diffstat (limited to 'actionpack/lib/action_controller/base/base.rb')
-rw-r--r--actionpack/lib/action_controller/base/base.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 60567454b1..7bbde519cc 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -30,10 +30,6 @@ module ActionController #:nodoc:
def allowed_methods_header
allowed_methods.map { |method_symbol| method_symbol.to_s.upcase } * ', '
end
-
- def handle_response!(response)
- response.headers['Allow'] ||= allowed_methods_header
- end
end
class NotImplemented < MethodNotAllowed #:nodoc:
@@ -510,9 +506,8 @@ module ActionController #:nodoc:
public
def call(env)
- # HACK: For global rescue to have access to the original request and response
- request = env["action_dispatch.rescue.request"] ||= ActionDispatch::Request.new(env)
- response = env["action_dispatch.rescue.response"] ||= ActionDispatch::Response.new
+ request = ActionDispatch::Request.new(env)
+ response = ActionDispatch::Response.new
process(request, response).to_a
end