diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-16 04:16:08 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-16 04:16:08 +0000 |
| commit | 4e15bf787e80f3a7ad1d3fa31338eff2cfbdd920 (patch) | |
| tree | 49b1a6b29f11178dc6e0226ced3b06021937f535 /actionpack/lib/action_controller/cgi_process.rb | |
| parent | 065b3af3582f5f557611b0730996fed885a5e3e9 (diff) | |
| download | rails-4e15bf787e80f3a7ad1d3fa31338eff2cfbdd920.tar.gz rails-4e15bf787e80f3a7ad1d3fa31338eff2cfbdd920.tar.bz2 rails-4e15bf787e80f3a7ad1d3fa31338eff2cfbdd920.zip | |
Fixed proxy support for lighttpd (closes #3267) [stephen_purcell@yahoo.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3894 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 | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 508dc016ac..b710f05d7c 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -75,22 +75,28 @@ module ActionController #:nodoc: @cgi.cookies.freeze end + def host_with_port + if forwarded = env["HTTP_X_FORWARDED_HOST"] + forwarded.split(/,\s?/).last + elsif http_host = env['HTTP_HOST'] + http_host + elsif server_name = env['SERVER_NAME'] + server_name + else + "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}" + end + end + def host - 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 + host_with_port[/^[^:]+/] 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'] + if host_with_port =~ /:(\d+)$/ + $1.to_i + else + standard_port + end end def session |