aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/commands/servers
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/commands/servers')
-rw-r--r--railties/lib/commands/servers/lighttpd.rb5
-rw-r--r--railties/lib/commands/servers/webrick.rb3
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb
index 0205e10c0a..6e3da4a9f8 100644
--- a/railties/lib/commands/servers/lighttpd.rb
+++ b/railties/lib/commands/servers/lighttpd.rb
@@ -52,5 +52,6 @@ else
end)
end
-trap(:INT) {exit}
-`lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
+trap(:INT) { exit }
+Thread.new { sleep 0.5; `open http://0.0.0.0:#{port}` } if RUBY_PLATFORM =~ /darwin/
+`lighttpd #{!detach ? "-D " : ""}-f #{config_file}` \ No newline at end of file
diff --git a/railties/lib/commands/servers/webrick.rb b/railties/lib/commands/servers/webrick.rb
index db8e8b3d93..d06e3309bd 100644
--- a/railties/lib/commands/servers/webrick.rb
+++ b/railties/lib/commands/servers/webrick.rb
@@ -8,7 +8,8 @@ OPTIONS = {
:server_root => File.expand_path(RAILS_ROOT + "/public/"),
:server_type => WEBrick::SimpleServer,
:charset => "UTF-8",
- :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes
+ :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes,
+ :open_in_browser => true
}
ARGV.options do |opts|