Correctly set Host header when using a proxy

Fixed a bug in _set_proxy_headers that ignores the port when setting the 'Host' HTTP header while a proxy is used.
urllib3 · Jul 29, 2013 · d89d508 · d89d508 · schlamar · Jul 31, 2013
1 parent 3e0e50c
commit d89d508
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/test/test_proxymanager.py b/test/test_proxymanager.py
@@ -23,5 +23,14 @@ def test_proxy_headers(self):
 
         self.assertEqual(headers, provided_headers)
 
+        # Verify proxy with nonstandard port
+        provided_headers = {'Accept': 'application/json'}
+        expected_headers = provided_headers.copy()
+        expected_headers.update({'Host': 'pypi.python.org:8080'})
+        url_with_port = 'http://pypi.python.org:8080/test'
+        headers = p._set_proxy_headers(url_with_port, provided_headers)
+
+        self.assertEqual(headers, expected_headers)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/urllib3/poolmanager.py b/urllib3/poolmanager.py
@@ -181,9 +181,9 @@ def _set_proxy_headers(self, url, headers=None):
         """
         headers_ = {'Accept': '*/*'}
 
-        host = parse_url(url).host
-        if host:
-            headers_['Host'] = host
+        netloc = parse_url(url).netloc
+        if netloc:
+            headers_['Host'] = netloc
 
         if headers:
             headers_.update(headers)