mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 76910 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76910 | senthil.kumaran | 2009-12-20 12:40:31 +0530 (Sun, 20 Dec 2009) | 10 lines

  Merged revisions 76908 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76908 | senthil.kumaran | 2009-12-20 11:35:13 +0530 (Sun, 20 Dec 2009) | 4 lines

    Fix for issue 7291 - urllib2 cannot handle https with proxy requiring auth
    Refactored HTTPHandler tests and added testcase for proxy authorization.
  ........
................
This commit is contained in:
Senthil Kumaran 2009-12-20 07:18:22 +00:00
parent 890c193887
commit 4b9fbebaee
4 changed files with 110 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/http/client.py
View file

@ -648,9 +648,13 @@ class HTTPConnection:
if strict is not None:
self.strict = strict
def _set_tunnel(self, host, port=None):
def _set_tunnel(self, host, port=None, headers=None):
self._tunnel_host = host
self._tunnel_port = port
if headers:
self._tunnel_headers = headers
else:
self._tunnel_headers.clear()
def _set_hostport(self, host, port):
if port is None:
@ -674,12 +678,18 @@ class HTTPConnection:
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_str = "CONNECT %s:%d HTTP/1.0\r\n" %(self.host, self.port)
connect_bytes = connect_str.encode("ascii")
self.send(connect_bytes)
for header, value in self._tunnel_headers.iteritems():
header_str = "%s: %s\r\n" % (header, value)
header_bytes = header_str.encode("ascii")
self.send(header_bytes)
response = self.response_class(self.sock, strict = self.strict,
method= self._method)
method = self._method)
(version, code, message) = response._read_status()
if code != 200:
self.close()
raise socket.error("Tunnel connection failed: %d %s" % (code,