diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 10:52:58 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 10:57:25 -0700 |
| commit | 6fd8346400f99c33cf207d422a22730427420dbb (patch) | |
| tree | c56f7e2d27515b7b1ecbde34fdcd722448e66c6b /actionpack/lib/action_dispatch | |
| parent | 6ed5b01f97cd6551e0072a9fb603f9c2487419ba (diff) | |
| download | rails-6fd8346400f99c33cf207d422a22730427420dbb.tar.gz rails-6fd8346400f99c33cf207d422a22730427420dbb.tar.bz2 rails-6fd8346400f99c33cf207d422a22730427420dbb.zip | |
pass the correct custom request to the recognize method
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/router.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb index 218c9e9d55..6bd77925a2 100644 --- a/actionpack/lib/action_dispatch/journey/router.rb +++ b/actionpack/lib/action_dispatch/journey/router.rb @@ -57,9 +57,7 @@ module ActionDispatch return [404, {'X-Cascade' => 'pass'}, ['Not Found']] end - def recognize(req) - rails_req = request_class.new(req.env) - + def recognize(rails_req) find_routes(rails_req).each do |match, parameters, route| unless route.path.anchored rails_req.script_name = match.to_s diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 9d7164eef2..d2366bb300 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -699,7 +699,7 @@ module ActionDispatch raise ActionController::RoutingError, e.message end - req = @request_class.new(env) + req = request_class.new(env) @router.recognize(req) do |route, params| params.merge!(extras) params.each do |key, value| |