2 files changed, 31 insertions, 0 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index a608693ca4..721a47a974 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -32,6 +32,11 @@ module Rails
 
         opt_parser.parse! args
 
+        # Handle's environment like RAILS_ENV=production passed in directly
+        if index = args.index {|arg| arg.include?("RAILS_ENV")}
+          options[:environment] ||= args.delete_at(index).split('=').last
+        end
+
         options[:server] = args.shift
         options
       end
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
new file mode 100644
index 0000000000..8039aec873
--- /dev/null
+++ b/railties/test/commands/server_test.rb
@@ -0,0 +1,26 @@
+require 'abstract_unit'
+require 'rails/commands/server'
+
+class Rails::ServerTest < ActiveSupport::TestCase
+
+  def test_environment_with_server_option
+    args    = ["thin", "RAILS_ENV=production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal 'production', options[:environment]
+    assert_equal 'thin', options[:server]
+  end
+
+  def test_environment_without_server_option
+    args    = ["RAILS_ENV=production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal 'production', options[:environment]
+    assert_nil options[:server]
+  end
+
+  def test_server_option_without_environment
+    args    = ["thin"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_nil options[:environment]
+    assert_equal 'thin', options[:server]
+  end
+end