aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-12-28 17:05:12 +0000
committerPratik Naik <pratiknaik@gmail.com>2008-12-28 17:07:13 +0000
commitfec0ea9d6d4ca56a09e3e83002c38d69c8ad924e (patch)
treef8048acb56e43fb58d1762ac678aa6048b06b5c0 /actionpack/lib/action_controller/request.rb
parentc0c79f779c990f9e53c9b600291801fdf0bbe56b (diff)
downloadrails-fec0ea9d6d4ca56a09e3e83002c38d69c8ad924e.tar.gz
rails-fec0ea9d6d4ca56a09e3e83002c38d69c8ad924e.tar.bz2
rails-fec0ea9d6d4ca56a09e3e83002c38d69c8ad924e.zip
Request#env['SERVER_NAME'] does not contain port number
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 8a02130d88..3390324162 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -286,7 +286,7 @@ EOM
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