From 306c14c41135dc8d308967821d0bb26cf4bb7ecd Mon Sep 17 00:00:00 2001
From: David Cornu <davidjcornu@gmail.com>
Date: Mon, 17 Aug 2015 18:02:35 +0000
Subject: [PATCH] Use the PORT environment variable for rails server

---
 railties/CHANGELOG.md                 | 4 ++++
 railties/lib/rails/commands/server.rb | 2 +-
 railties/test/commands/server_test.rb | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 21adac272db28..faf6846e4b6fd 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   `rails server` will now honour the `PORT` environment variable
+
+    *David Cornu*
+
 *   Plugins generated using `rails plugin new` are now generated with the
     version number set to 0.1.0.
 
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index c8fb58ab05fde..d3ea441f8ee26 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -86,7 +86,7 @@ def middleware
 
     def default_options
       super.merge({
-        Port:               3000,
+        Port:               ENV.fetch('PORT', 3000).to_i,
         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 7a063aeddf0a6..3be4a74f7455e 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -44,6 +44,13 @@ def test_environment_with_rack_env
     end
   end
 
+  def test_environment_with_port
+    switch_env "PORT", "1234" do
+      server = Rails::Server.new
+      assert_equal 1234, server.options[:Port]
+    end
+  end
+
   def test_caching_without_option
     args = []
     options = Rails::Server::Options.new.parse!(args)