diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 8a02130d88d5af940901e0492393242d157b8e8b..33903241627f71734dcb9ee40e63d25a50d313d5 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -286,7 +286,7 @@ def raw_host_with_port
       if forwarded = env["HTTP_X_FORWARDED_HOST"]
         forwarded.split(/,\s?/).last
       else
-        env['HTTP_HOST'] || env['SERVER_NAME'] || "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
+        env['HTTP_HOST'] || "#{env['SERVER_NAME'] || env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
       end
     end
 
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index acfb10cdcaa2b900748592be5be00f22daa9d841..285a8b09e49a28fa5488eab66fff8fccb9602eb7 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -33,11 +33,7 @@ class TestRequest < Request #:nodoc:
     attr_accessor :host
 
     def initialize
-      env = Rack::MockRequest.env_for("/")
-
-      # TODO: Fix Request to assume env['SERVER_ADDR'] doesn't contain port number
-      env['SERVER_ADDR'] = env.delete("SERVER_NAME")
-      super(env)
+      super(Rack::MockRequest.env_for("/"))
 
       @query_parameters   = {}
       @session            = TestSession.new
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 406e2b2818f308f2c38e1c73cc50c55585a64a1f..31bff4ae6d92bf972cfec4c042d458fcbb53c4d3 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -4,7 +4,7 @@ class BaseRackTest < Test::Unit::TestCase
   def setup
     @env = {
       "HTTP_MAX_FORWARDS" => "10",
-      "SERVER_NAME" => "glu.ttono.us:8007",
+      "SERVER_NAME" => "glu.ttono.us",
       "FCGI_ROLE" => "RESPONDER",
       "AUTH_TYPE" => "Basic",
       "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
@@ -145,7 +145,7 @@ def test_cgi_environment_variables
     assert_equal "kevin", @request.remote_user
     assert_equal :get, @request.request_method
     assert_equal "/dispatch.fcgi", @request.script_name
-    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal "glu.ttono.us", @request.server_name
     assert_equal 8007, @request.server_port
     assert_equal "HTTP/1.1", @request.server_protocol
     assert_equal "lighttpd", @request.server_software