Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…#687 [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit ab3a813364c1c238728901849389bd2227ded8c2 1 parent 67a6668
@dhh dhh authored
View
2  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
View
4 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)
View
1  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)
Please sign in to comment.
Something went wrong with that request. Please try again.