Fix Webrick Daemon dispatching bug regarding a bad current working directory. Closes #4899 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5784 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
e2acd16810
commit
c6b4c8d240
@ -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]
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user