diff options
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 812899b327..1690f0bb58 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -79,7 +79,13 @@ module ActionController #:nodoc: end def host - env["HTTP_X_FORWARDED_HOST"] || ($1 if env['HTTP_HOST'] && /^(.*):\d+$/ =~ env['HTTP_HOST']) || @cgi.host.to_s.split(":").first || '' + if env["HTTP_X_FORWARDED_HOST"] + env["HTTP_X_FORWARDED_HOST"].split(/,\s?/).last + elsif env['HTTP_HOST'] =~ /^(.*):\d+$/ + $1 + else + @cgi.host.to_s.split(":").first || '' + end end def port |