diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2009-12-20 07:18:22 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2009-12-20 07:18:22 (GMT) |
| commit | 4b9fbebaee627393f0bdd501c8882c6b8cbdc1ff (patch) | |
| tree | c3d1a195be3065b4981cb40f56cb077deb0364ba /Lib/http | |
| parent | 890c19388762c7e93168d23e149cc03febc98269 (diff) | |
| download | cpython-4b9fbebaee627393f0bdd501c8882c6b8cbdc1ff.zip cpython-4b9fbebaee627393f0bdd501c8882c6b8cbdc1ff.tar.gz cpython-4b9fbebaee627393f0bdd501c8882c6b8cbdc1ff.tar.bz2 | |
Merged revisions 76910 via svnmerge from
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.
........
................
Diffstat (limited to 'Lib/http')
| -rw-r--r-- | Lib/http/client.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py index 42da984..1de34ef 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -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, |