diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-06 02:22:06 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-06 02:22:06 -0700 |
| commit | 4c755f977c0f3acaa2c331dc9ab03c1ee1c28966 (patch) | |
| tree | 937e0a4cc6eae81eeaddae2599f409bde002da33 | |
| parent | 785ee65ddfc3cd361ea2a0dbde3bfb908ed62192 (diff) | |
| parent | 1f1989dee00ac366a2ae638461c68ccdd6b64586 (diff) | |
| download | rails-4c755f977c0f3acaa2c331dc9ab03c1ee1c28966.tar.gz rails-4c755f977c0f3acaa2c331dc9ab03c1ee1c28966.tar.bz2 rails-4c755f977c0f3acaa2c331dc9ab03c1ee1c28966.zip | |
Merge pull request #408 from etdsoft/master
Rails::Server outputs 'http://' even when running over SSL
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 3 |
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] |