diff options
| author | adam <code@getbraintree.com> | 2015-03-20 20:30:30 +0000 |
|---|---|---|
| committer | adam <code@getbraintree.com> | 2015-03-20 20:32:30 +0000 |
| commit | b49cac80de2d0245d8a704eebf555c54371b41d8 (patch) | |
| tree | 14016e73a0ab9f51e1c9196411f4f29579556ba5 /actionpack/test | |
| parent | 013b716f384a090f189ea7a98efd4c4171555454 (diff) | |
| download | rails-b49cac80de2d0245d8a704eebf555c54371b41d8.tar.gz rails-b49cac80de2d0245d8a704eebf555c54371b41d8.tar.bz2 rails-b49cac80de2d0245d8a704eebf555c54371b41d8.zip | |
Fix handling of empty X_FORWARDED_HOST header.
Previously, an empty X_FORWARDED_HOST header would cause
Actiondispatch::Http:URL.raw_host_with_port to return nil, causing
Actiondispatch::Http:URL.host to raise a NoMethodError.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index ee8e915610..61cc4dcd7e 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -435,6 +435,9 @@ class RequestHost < BaseRequestTest request = stub_request 'HTTP_X_FORWARDED_HOST' => "www.firsthost.org, www.secondhost.org" assert_equal "www.secondhost.org", request.host + + request = stub_request 'HTTP_X_FORWARDED_HOST' => "", 'HTTP_HOST' => "rubyonrails.org" + assert_equal "rubyonrails.org", request.host end test "http host with default port overrides server port" do |