From a278630f5f1312f6986a866d3bc455c1056e554e Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Thu, 6 Aug 2015 17:22:22 -0700 Subject: do not add common ports to HTTP_HOST - webservers do not do it - it makes redirect urls ugly when request.host is used for redirection --- actionpack/lib/action_dispatch/testing/integration.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 0298962409..06605f5b33 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -325,7 +325,11 @@ module ActionDispatch if path =~ %r{://} location = URI.parse(path) https! URI::HTTPS === location if location.scheme - host! "#{location.host}:#{location.port}" if location.host + if url_host = location.host + default = Rack::Request::DEFAULT_PORTS[location.scheme] + url_host += ":#{location.port}" if default != location.port + host! url_host + end path = location.query ? "#{location.path}?#{location.query}" : location.path end -- cgit v1.2.3