Merge remote-tracking branch 'duffer/pretty-host'

2 files changed, 15 insertions, 4 deletions

diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index a593c8c3..13ced265 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -1035,7 +1035,7 @@ class TestRequest:
         assert r.url == "https://address:22/path"
 
         assert r.pretty_url == "https://address:22/path"
-        r.headers["Host"] = "foo.com"
+        r.headers["Host"] = "foo.com:22"
         assert r.url == "https://address:22/path"
         assert r.pretty_url == "https://foo.com:22/path"
 
diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py
index b4ecfd4e..5672259e 100644
--- a/test/netlib/http/test_request.py
+++ b/test/netlib/http/test_request.py
@@ -104,25 +104,36 @@ class TestRequestUtils(object):
 
     def test_pretty_host(self):
         request = treq()
+        # Without host header
         assert request.pretty_host == "address"
         assert request.host == "address"
-        request.headers["host"] = "other"
+        # Same port as self.port (22)
+        request.headers["host"] = "other:22"
         assert request.pretty_host == "other"
+        # Different ports
+        request.headers["host"] = "other"
+        assert request.pretty_host == "address"
         assert request.host == "address"
+        # Empty host
         request.host = None
         assert request.pretty_host is None
         assert request.host is None
 
         # Invalid IDNA
-        request.headers["host"] = ".disqus.com"
+        request.headers["host"] = ".disqus.com:22"
         assert request.pretty_host == ".disqus.com"
 
     def test_pretty_url(self):
         request = treq()
+        # Without host header
         assert request.url == "http://address:22/path"
         assert request.pretty_url == "http://address:22/path"
-        request.headers["host"] = "other"
+        # Same port as self.port (22)
+        request.headers["host"] = "other:22"
         assert request.pretty_url == "http://other:22/path"
+        # Different ports
+        request.headers["host"] = "other"
+        assert request.pretty_url == "http://address:22/path"
 
     def test_pretty_url_authority(self):
         request = treq(first_line_format="authority")