Fix python interception for http.client requests with inline ports

Previously, calling http.client.HTTPConnection('example.com', 80)
worked fine, but http.client.HTTPConnection('example.com:80') failed
because that string was used directly as the host, with the default
80 set as the port separately in our override. The override now
delegates handling this back to Python itself, to ensure that works
correctly.

Most users aren't doing this directly anyway, and libraries typically
call low-level HTTP methods with the full port automatically, but
it can fail in some real-world cases.

Author: pimterry

overrides/pythonpath/http/client.py

@@ -16,7 +16,7 @@
 # Redirect and then tunnel all plain HTTP connections:
 _http_connection_init = HTTPConnection.__init__
 @functools.wraps(_http_connection_init)
-def _new_http_connection_init(self, host, port=80, *k, **kw):
+def _new_http_connection_init(self, host, port=None, *k, **kw):
     _http_connection_init(self, _proxyHost, int(_proxyPort), *k, **kw)
     self.set_tunnel(host, port)
 HTTPConnection.__init__ = _new_http_connection_init
@@ -31,7 +31,7 @@ def _build_default_context():
 # Redirect & tunnel HTTPS connections, and inject our CA certificate:
 _https_connection_init = HTTPSConnection.__init__
 @functools.wraps(_https_connection_init)
-def _new_https_connection_init(self, host, port=443, *k, **kw):
+def _new_https_connection_init(self, host, port=None, *k, **kw):
     context = None
     if 'context' in kw:
         context = kw.get('context')

overrides/pythonpath/httplib.py

@@ -16,7 +16,7 @@
 # Redirect and then tunnel all plain HTTP connections:
 _http_connection_init = HTTPConnection.__init__
 @functools.wraps(_http_connection_init)
-def _new_http_connection_init(self, host, port=80, *k, **kw):
+def _new_http_connection_init(self, host, port=None, *k, **kw):
     _http_connection_init(self, _proxyHost, _proxyPort, *k, **kw)
     self.set_tunnel(host, port)
 HTTPConnection.__init__ = _new_http_connection_init
@@ -31,7 +31,7 @@ def _build_default_context():
 # Redirect & tunnel HTTPS connections, and inject our CA certificate:
 _https_connection_init = HTTPSConnection.__init__
 @functools.wraps(_https_connection_init)
-def _new_https_connection_init(self, host, port=443, *k, **kw):
+def _new_https_connection_init(self, host, port=None, *k, **kw):
     context = None
     if 'context' in kw:
         context = kw.get('context')