mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-14 02:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #26864: Fix case insensitivity and suffix comparison with no_proxy

Browse source 
Patch by Xiang Zhang.
This commit is contained in:
Martin Panter 2016-04-30 01:03:40 +00:00
parent 6d34bbbfc7
commit aa27982ffc
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/urllib/request.py
View file

@ -2432,8 +2432,12 @@ def proxy_bypass_environment(host, proxies=None):
# check if the host ends with any of the DNS suffixes
no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')]
for name in no_proxy_list:
if name and (hostonly.endswith(name) or host.endswith(name)):
return 1
if name:
name = re.escape(name)
pattern = r'(.+\.)?%s$' % name
if (re.match(pattern, hostonly, re.I)
or re.match(pattern, host, re.I)):
return 1
# otherwise, don't bypass
return 0