diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-06-01 15:42:08 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-06-01 15:42:08 +0000 |
| commit | b20c575ac02373723438468932ceddd97056c9ec (patch) | |
| tree | 5f977af66c7c75f1d11ba9a81a3bfac75a452e6e /railties | |
| parent | 74b7bfa6d2c5c777b11cb6ea8687c0461b579f7e (diff) | |
| download | rails-b20c575ac02373723438468932ceddd97056c9ec.tar.gz rails-b20c575ac02373723438468932ceddd97056c9ec.tar.bz2 rails-b20c575ac02373723438468932ceddd97056c9ec.zip | |
New routes implementation. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4394 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f5831d3352..25ba0e9620 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. [Jamis Buck] + * Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson] * Added lib/ to the directories that will get application docs generated [DHH] diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 721a367f71..6290be3774 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -35,7 +35,7 @@ class Dispatcher if cgi ||= new_cgi(output) request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi) prepare_application - ActionController::Routing::Routes.recognize!(request).process(request, response).out(output) + ActionController::Routing::Routes.recognize(request).process(request, response).out(output) end rescue Object => exception failsafe_response(output, '500 Internal Server Error', exception) do |