diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-11-06 16:36:10 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-11-06 16:36:10 +0000 |
| commit | 9a8d583a910f81bc9241ed19abc6e01b4728a766 (patch) | |
| tree | f24ca7296351849138470d1d6ca78704e707eb40 /actionpack/lib/action_controller/cgi_process.rb | |
| parent | fdc767d4477ff94c6a8dea94905b100c8d8fcd12 (diff) | |
| download | rails-9a8d583a910f81bc9241ed19abc6e01b4728a766.tar.gz rails-9a8d583a910f81bc9241ed19abc6e01b4728a766.tar.bz2 rails-9a8d583a910f81bc9241ed19abc6e01b4728a766.zip | |
Fixed that ActionController::CgiRequest#host_with_port() should handle standard port (closes #10082) [moro]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8088 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index adc594f03e..b3739ce399 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -82,7 +82,7 @@ module ActionController #:nodoc: @cgi.cookies.freeze end - def host_with_port + def host_with_port_without_standard_port_handling if forwarded = env["HTTP_X_FORWARDED_HOST"] forwarded.split(/,\s?/).last elsif http_host = env['HTTP_HOST'] @@ -95,11 +95,11 @@ module ActionController #:nodoc: end def host - host_with_port.sub(/:\d+$/, '') + host_with_port_without_standard_port_handling.sub(/:\d+$/, '') end def port - if host_with_port =~ /:(\d+)$/ + if host_with_port_without_standard_port_handling =~ /:(\d+)$/ $1.to_i else standard_port |