diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 00:15:02 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 00:15:02 +0000 |
commit | bcb81167960293596d44587ea237ace4d505b960 (patch) | |
tree | 9b26dd942af3323a1a09a1182f79b6e6322a1f55 /actionpack/lib | |
parent | a971dc5e4aa45f747d375c3703fadc5d1568c876 (diff) | |
download | rails-bcb81167960293596d44587ea237ace4d505b960.tar.gz rails-bcb81167960293596d44587ea237ace4d505b960.tar.bz2 rails-bcb81167960293596d44587ea237ace4d505b960.zip |
Fixed that host would choke when cgi.host returned nil #432 [Tobias Luetke]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@381 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 8bebac0e3e..eda8fd651b 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -61,7 +61,7 @@ module ActionController #:nodoc: end def host - env["HTTP_X_FORWARDED_HOST"] || @cgi.host.split(":").first + env["HTTP_X_FORWARDED_HOST"] || @cgi.host.to_s.split(":").first end def session |