Merge branch 'main' into fix-bpo-22708

python · orsenthil · Apr 5, 2023 · Jul 16, 2018 · Jul 16, 2018 · Jul 20, 2018
commit f370042ac08868215c8f9c6eaeb52a5d092c2c44
diff --git a/Lib/http/client.py b/Lib/http/client.py
@@ -934,10 +934,10 @@ def set_debuglevel(self, level):
        self.debuglevel = level

    def _tunnel(self):
-        connect_bytes = b"CONNECT %s:%d %s\r\n" % (
+        connect = b"CONNECT %s:%d %s\r\n" % (
            self._tunnel_host.encode("idna"), self._tunnel_port,
            self._http_vsn_str.encode("ascii"))
-        self.send(connect_bytes)
+        headers = [connect]
        for header, value in self._tunnel_headers.items():
            headers.append(f"{header}: {value}\r\n".encode("latin-1"))
        headers.append(b"\r\n")

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
@@ -1,4 +1,5 @@
 import copy
+import enum
 import errno
 from http import client, HTTPStatus
 import io

diff --git a/Misc/ACKS b/Misc/ACKS
@@ -688,6 +688,7 @@ Mark Hammond
 Harald Hanche-Olsen
 Manus Hand
 Michael Handler
+Andreas Hangauer
 Milton L. Hankins
 Carl Bordum Hansen
 Stephen Hansen