diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-24 16:14:42 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-24 16:14:42 -0700 |
| commit | cccc759ff7ede6e2d3c15fdad7574c536fb275e8 (patch) | |
| tree | 6e77019275fd5714255dea6be512bc2f4e3183c4 /actionpack/lib/action_dispatch/http/url.rb | |
| parent | a1ff5585bd537bf5005cca11442566abb7422311 (diff) | |
| download | rails-cccc759ff7ede6e2d3c15fdad7574c536fb275e8.tar.gz rails-cccc759ff7ede6e2d3c15fdad7574c536fb275e8.tar.bz2 rails-cccc759ff7ede6e2d3c15fdad7574c536fb275e8.zip | |
remove more direct access to `env`
Diffstat (limited to 'actionpack/lib/action_dispatch/http/url.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 6fcf49030b..096fe2fcf8 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -229,10 +229,10 @@ 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"].presence + if forwarded = x_forwarded_host.presence forwarded.split(/,\s?/).last else - env['HTTP_HOST'] || "#{env['SERVER_NAME'] || env['SERVER_ADDR']}:#{env['SERVER_PORT']}" + get_header('HTTP_HOST') || "#{server_name || server_addr}:#{get_header('SERVER_PORT')}" end end |