diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
| commit | 2ebe8d275efa53af967b09ad66dab68acc1aed98 (patch) | |
| tree | b0b3e42c277b213788b55558aef3579f4e242300 /actionpack/test/controller/cgi_test.rb | |
| parent | 73ef94e9675ef6db85f18f1e3c70bf6ddfc1260a (diff) | |
| parent | 8cb14ee1203c9ed380c4b192e8730757a52d43cb (diff) | |
| download | rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.gz rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.bz2 rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/request.rb
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionpack/test/controller/cgi_test.rb')
| -rw-r--r-- | actionpack/test/controller/cgi_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/cgi_test.rb b/actionpack/test/controller/cgi_test.rb index 8ca70f8595..813171857a 100644 --- a/actionpack/test/controller/cgi_test.rb +++ b/actionpack/test/controller/cgi_test.rb @@ -75,7 +75,7 @@ class CgiRequestTest < BaseCgiTest assert_equal "rubyonrails.org:8080", @request.host_with_port @request_hash['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org" - assert_equal "www.secondhost.org", @request.host + assert_equal "www.secondhost.org", @request.host(true) end def test_http_host_with_default_port_overrides_server_port |