aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Martin <etd@nomejortu.com>2011-05-06 07:22:27 +0100
committerDaniel Martin <etd@nomejortu.com>2011-05-06 07:22:27 +0100
commit1f1989dee00ac366a2ae638461c68ccdd6b64586 (patch)
tree937e0a4cc6eae81eeaddae2599f409bde002da33
parent785ee65ddfc3cd361ea2a0dbde3bfb908ed62192 (diff)
downloadrails-1f1989dee00ac366a2ae638461c68ccdd6b64586.tar.gz
rails-1f1989dee00ac366a2ae638461c68ccdd6b64586.tar.bz2
rails-1f1989dee00ac366a2ae638461c68ccdd6b64586.zip
Take into account the Rack::Server :SSLEnable option when building the application's URL
-rw-r--r--railties/lib/rails/commands/server.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index e447209242..505a4ca2bd 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -55,8 +55,9 @@ module Rails
end
def start
+ url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
- puts "=> Rails #{Rails.version} application starting in #{Rails.env} on http://#{options[:Host]}:#{options[:Port]}"
+ puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
puts "=> Call with -d to detach" unless options[:daemonize]
trap(:INT) { exit }
puts "=> Ctrl-C to shutdown server" unless options[:daemonize]