diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-07-08 13:02:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 13:02:45 -0500 |
| commit | 8e74f71bd1bc241af62ff4613ea4db52003bc3a9 (patch) | |
| tree | 017e9ba22b22bd00f11be7dbea46661214a3c8c9 /railties | |
| parent | 48e8056d4f9bfb764575b20ba3791a71f5d9d3ea (diff) | |
| parent | e17d7275f49a7286439d972f01b0fb42331dcdb7 (diff) | |
| download | rails-8e74f71bd1bc241af62ff4613ea4db52003bc3a9.tar.gz rails-8e74f71bd1bc241af62ff4613ea4db52003bc3a9.tar.bz2 rails-8e74f71bd1bc241af62ff4613ea4db52003bc3a9.zip | |
Merge pull request #25688 from mahnunchik/host-env-var
Use the HOST environment variable for rails server #25677
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 1 | ||||
| -rw-r--r-- | railties/test/commands/server_test.rb | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 7418dff18b..f641d9bf2c 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -90,6 +90,7 @@ module Rails def default_options super.merge({ Port: ENV.fetch('PORT', 3000).to_i, + Host: ENV.fetch('HOST', 'localhost').dup, DoNotReverseLookup: true, environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup, daemonize: false, diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb index 38a1605d1f..b9a48bbf98 100644 --- a/railties/test/commands/server_test.rb +++ b/railties/test/commands/server_test.rb @@ -51,6 +51,13 @@ class Rails::ServerTest < ActiveSupport::TestCase end end + def test_environment_with_host + switch_env "HOST", "1.2.3.4" do + server = Rails::Server.new + assert_equal "1.2.3.4", server.options[:Host] + end + end + def test_caching_without_option args = [] options = Rails::Server::Options.new.parse!(args) |