Permalink
Browse files

apply [5784] to 1.2 pre-release

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5787 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent da8a896 commit 1fb2f21d1a7776b972e9c828225c686c19e93326 @technoweenie technoweenie committed Dec 25, 2006
Showing with 5 additions and 0 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +3 −0 railties/lib/webrick_server.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fix Webrick Daemon dispatching bug regarding a bad current working directory. Closes #4899 [Rick Olson]
+
* Make config.plugins affect the load path and the dependencies system. Allows you to control plugin loading order, and keep disabled plugins off the load path. [James Adam]
* Don't generate a components directory in new Rails apps. [Jeremy Kemper]
@@ -66,6 +66,9 @@ def self.dispatch(options = {})
def initialize(server, options) #:nodoc:
@server_options = options
@file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
+ # Change to the RAILS_ROOT, since Webrick::Daemon.start does a Dir::cwd("/")
+ # OPTIONS['working_directory'] is an absolute path of the RAILS_ROOT, set in railties/lib/commands/servers/webrick.rb
+ Dir.chdir(OPTIONS['working_directory']) if defined?(OPTIONS) && File.directory?(OPTIONS['working_directory'])
super
end

0 comments on commit 1fb2f21

Please sign in to comment.