From 47fff87027dcf6493d177902b7d851a6582f76d0 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 20 Dec 2009 07:10:31 +0000 Subject: 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. ........ --- Lib/urllib/request.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Lib/urllib/request.py') diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 6c7215219c..82a61eea25 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -31,8 +31,8 @@ install_opener -- Installs a new opener as the default opener. objects of interest: -OpenerDirector -- Sets up the User-Agent as the Python-urllib and manages the -Handler classes while dealing with both requests and responses. +OpenerDirector -- Sets up the User Agent as the Python-urllib client and manages +the Handler classes, while dealing with requests and responses. Request -- An object that encapsulates the state of a request. The state can be as simple as the URL. It can also include extra HTTP @@ -1059,7 +1059,14 @@ class AbstractHTTPHandler(BaseHandler): headers = dict((name.title(), val) for name, val in headers.items()) if req._tunnel_host: - h.set_tunnel(req._tunnel_host) + tunnel_headers = {} + proxy_auth_hdr = "Proxy-Authorization" + if proxy_auth_hdr in headers: + tunnel_headers[proxy_auth_hdr] = headers[proxy_auth_hdr] + # Proxy-Authorization should not be sent to origin + # server. + del headers[proxy_auth_hdr] + h.set_tunnel(req._tunnel_host, headers=tunnel_headers) try: h.request(req.get_method(), req.selector, req.data, headers) -- cgit v1.2.1