Fixed that script/server -d was broken so daemon mode couldn't be used …

…rails#687 [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that script/server -d was broken so daemon mode couldn't be used #687 [Nicholas Seckar]
+
 * Upgraded to breakpoint 92 which fixes:
 
     * overload IRB.parse_opts(), fixes #443

railties/bin/server

@@ -45,5 +45,7 @@ ENV["RAILS_ENV"] = OPTIONS[:environment]
 require File.dirname(__FILE__) + "/../config/environment"
 require 'webrick_server'
 
+OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
+
 puts "=> Rails application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
-DispatchServlet.dispatch(OPTIONS)
+DispatchServlet.dispatch(OPTIONS)

railties/lib/webrick_server.rb

@@ -18,6 +18,7 @@ def self.dispatch(options = {})
 
     trap("INT") { server.shutdown }
     server.start
+    Dir::chdir(OPTIONS['working_directory']) if OPTIONS['working_directory']
   end
 
   def initialize(server, options)