aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-08 16:49:47 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-08 16:50:00 -0800
commit056042eb829e0507ed605264d43a79ce88112288 (patch)
treec4ff22c2fa76e5b1bc013948aff4f068cdd4e172 /actionpack/lib/action_controller/metal
parent146a5305d56b636d2fd2c2a09a58f5f3edc2d9c0 (diff)
downloadrails-056042eb829e0507ed605264d43a79ce88112288.tar.gz
rails-056042eb829e0507ed605264d43a79ce88112288.tar.bz2
rails-056042eb829e0507ed605264d43a79ce88112288.zip
Simplify the action endpoint:
* Remove ActionEndpoint in favor of passing a block to MiddlewareStack * Always create a Request; the performance win of RackDelegation is around the response; the Request object hit is limited to a single object allocation * #dispatch takes a Request
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/rack_delegation.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index bb55383631..37106733cb 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -6,14 +6,11 @@ module ActionController
extend ActiveSupport::Concern
included do
- delegate :session, :to => "@_request"
delegate :headers, :status=, :location=, :content_type=,
:status, :location, :content_type, :to => "@_response"
- attr_internal :request
end
- def dispatch(action, env)
- @_request = ActionDispatch::Request.new(env)
+ def dispatch(action, request)
@_response = ActionDispatch::Response.new
@_response.request = request
super