From 302533b196a2ead2c1bd046b2d9df9cf4f861354 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Fri, 13 Jan 2006 08:31:16 +0000 Subject: Add support for multiple proxy servers in HTTP_X_FORWARDED_HOST. Closes #3397 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3412 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/cgi_process.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') 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 -- cgit v1.2.3