mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixed Issue1424152 in Py3k: urllib2 fails with HTTPS over Proxy.

Browse source
This commit is contained in:
Senthil Kumaran 2009-07-25 04:24:38 +00:00
parent be0e177ae5
commit 97f0c6be46
5 changed files with 68 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/http/client.py
View file

@ -644,11 +644,17 @@ class HTTPConnection:
self.__response = None
self.__state = _CS_IDLE
self._method = None
self._tunnel_host = None
self._tunnel_port = None
self._set_hostport(host, port)
if strict is not None:
self.strict = strict
def set_tunnel(self, host, port=None):
self._tunnel_host = host
self._tunnel_port = port
def _set_hostport(self, host, port):
if port is None:
i = host.rfind(':')
@ -669,10 +675,29 @@ class HTTPConnection:
def set_debuglevel(self, level):
self.debuglevel = level
def _tunnel(self):
self._set_hostport(self._tunnel_host, self._tunnel_port)
connect_str = "CONNECT %s:%d HTTP/1.0\r\n\r\n" %(self.host, self.port)
connect_bytes = connect_str.encode("ascii")
self.send(connect_bytes)
response = self.response_class(self.sock, strict = self.strict,
method= self._method)
(version, code, message) = response._read_status()
if code != 200:
self.close()
raise socket.error("Tunnel connection failed: %d %s" % (code,
message.strip()))
while True:
line = response.fp.readline()
if line == b'\r\n':
break
def connect(self):
"""Connect to the host and port specified in __init__."""
self.sock = socket.create_connection((self.host,self.port),
self.timeout)
if self._tunnel_host:
self._tunnel()
def close(self):
"""Close the connection to the HTTP server."""
@ -1008,6 +1033,11 @@ else:
sock = socket.create_connection((self.host, self.port),
self.timeout)
if self._tunnel_host:
self.sock = sock
self._tunnel()
self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)