diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-10-15 01:00:25 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-10-15 01:00:25 +0000 |
| commit | e0e8f0a3027f3777b961df9f9164d0bdd2fc0fbd (patch) | |
| tree | 969f515f768cc0caf7537501c557dafd290fe7f4 /actionpack/lib/action_controller/cgi_process.rb | |
| parent | 70869931611667d5b732ae91704313115e4baa10 (diff) | |
| download | rails-e0e8f0a3027f3777b961df9f9164d0bdd2fc0fbd.tar.gz rails-e0e8f0a3027f3777b961df9f9164d0bdd2fc0fbd.tar.bz2 rails-e0e8f0a3027f3777b961df9f9164d0bdd2fc0fbd.zip | |
Fix Request#host_with_port to use the standard port when Rails is behind a proxy.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |