diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-04-30 01:03:40 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-30 01:03:40 (GMT) |
| commit | 064ee4d28cbc39da8d0a872b71dd8c2b72cdfa9d (patch) | |
| tree | c1b8d486852c539bde162c1f202b0077cfd496d5 /Lib/urllib.py | |
| parent | 4ef4edaa9fefe55dbe144960d74a229cfb1cf796 (diff) | |
| download | cpython-064ee4d28cbc39da8d0a872b71dd8c2b72cdfa9d.zip cpython-064ee4d28cbc39da8d0a872b71dd8c2b72cdfa9d.tar.gz cpython-064ee4d28cbc39da8d0a872b71dd8c2b72cdfa9d.tar.bz2 | |
Issue #26864: Fix case insensitivity and suffix comparison with no_proxy
Patch by Xiang Zhang.
Diffstat (limited to 'Lib/urllib.py')
| -rw-r--r-- | Lib/urllib.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index 6d17e6f..055707f 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1423,8 +1423,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 |