diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 032046408e..d23a2abb04 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that host would choke when cgi.host returned nil #432 [Tobias Luetke] + * Added that form helpers now take an index option #448 [Tim Bates] Example: 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 |