diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ae4d48df0c..11fa6bdc37 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Remove Dir.chdir in the Webrick DispatchServlet#initialize method. Fix bad path errors when trying to load config/routes.rb. [Rick Olson] + * Tighten rescue clauses. #5985 [james@grayproductions.net] * Cleaning up tests. [Kevin Clark, Jeremy Kemper] diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 533cf8c34b..b3e28e812b 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -66,7 +66,6 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet def initialize(server, options) #:nodoc: @server_options = options @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root]) - Dir.chdir("#{RAILS_ROOT}/public") if defined?(RAILS_ROOT) && File.directory?("#{RAILS_ROOT}/public") super end |