mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 76908 via svnmerge from

Browse source 
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:10:31 +00:00
parent 0639d5aeb6
commit 47fff87027
4 changed files with 115 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/urllib/request.py
View file

@ -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)