Backed out of #1694 as it broke requests that hit the cache with wrong...

Backed out of #1694 as it broke requests that hit the cache with wrong argument type nil (expected Module) on WEBrick

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1705 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 26ccf4cb
......@@ -416,33 +416,21 @@ def write_generation
return (method_sources << code)
end
@@recognized_route_cache = {}
def recognize(request)
if recognized = @@recognized_route_cache[request.path]
controller, options = recognized
request.path_parameters = options
controller.new
else
string_path = request.path
string_path.chomp! if string_path[0] == ?/
path = string_path.split '/'
path.shift
hash = recognize_path(path)
recognition_failed(request) unless hash && hash['controller']
controller = hash['controller']
hash['controller'] = controller.controller_path
request.path_parameters = hash
@@recognized_route_cache[request.path] = [controller, hash]
controller.new
end
string_path = request.path
string_path.chomp! if string_path[0] == ?/
path = string_path.split '/'
path.shift
hash = recognize_path(path)
recognition_failed(request) unless hash && hash['controller']
controller = hash['controller']
hash['controller'] = controller.controller_path
request.path_parameters = hash
controller.new
end
alias :recognize! :recognize
def clear_recognized_route_cache!
@@recognized_route_cache.clear
end
def recognition_failed(request)
raise ActionController::RoutingError, "Recognition failed for #{request.path.inspect}"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册