diff options
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 4413a29791..7f05e21cb8 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -79,7 +79,15 @@ module ActionController #:nodoc: end def host - env["HTTP_X_FORWARDED_HOST"] || @cgi.host.to_s.split(":").first || '' + env["HTTP_X_FORWARDED_HOST"] || ($1 if env['HTTP_HOST'] && /^(.*):\d+$/ =~ env['HTTP_HOST']) || @cgi.host.to_s.split(":").first || '' + end + + def port + env["HTTP_X_FORWARDED_HOST"] ? standard_port : (port_from_http_host || super) + end + + def port_from_http_host + $1.to_i if env['HTTP_HOST'] && /:(\d+)$/ =~ env['HTTP_HOST'] end def session |