diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-20 18:28:21 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-20 18:28:21 -0300 |
| commit | 37e002ba96ad7f08796cdc7515de345ac5a88544 (patch) | |
| tree | 14e7167c3ab972c50ae6c67b760d9f3d78336674 /actionpack/lib | |
| parent | 7c7d9dcf5a966a5490fe99230ab9513d73df9630 (diff) | |
| parent | b49cac80de2d0245d8a704eebf555c54371b41d8 (diff) | |
| download | rails-37e002ba96ad7f08796cdc7515de345ac5a88544.tar.gz rails-37e002ba96ad7f08796cdc7515de345ac5a88544.tar.bz2 rails-37e002ba96ad7f08796cdc7515de345ac5a88544.zip | |
Merge pull request #19433 from agfor/fix_host_with_x_forwarded_host_header
Fix handling of empty X_FORWARDED_HOST header.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 7da6301ac4..f5b709ccd6 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -229,7 +229,7 @@ module ActionDispatch # req = Request.new 'HTTP_HOST' => 'example.com:8080' # req.raw_host_with_port # => "example.com:8080" def raw_host_with_port - if forwarded = env["HTTP_X_FORWARDED_HOST"] + if forwarded = env["HTTP_X_FORWARDED_HOST"].presence forwarded.split(/,\s?/).last else env['HTTP_HOST'] || "#{env['SERVER_NAME'] || env['SERVER_ADDR']}:#{env['SERVER_PORT']}" |