Skip to content

Commit

Permalink
Fix Webrick Daemon dispatching bug regarding a bad current working di…
Browse files Browse the repository at this point in the history
…rectory. Closes #4899 [Rick Olson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5784 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
technoweenie committed Dec 25, 2006
1 parent e2acd16 commit c6b4c8d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions railties/CHANGELOG
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
4 changes: 3 additions & 1 deletion railties/lib/webrick_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ def self.dispatch(options = {})
server.mount('/', DispatchServlet, options)

trap("INT") { server.shutdown }

server.start
end

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

Expand Down

0 comments on commit c6b4c8d

Please sign in to comment.