diff options
| author | Xiang Zhang <angwerzx@126.com> | 2017-01-09 03:50:02 (GMT) |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2017-01-09 03:50:02 (GMT) |
| commit | c44d58a77a123873b093c4690056ef4d20e873f3 (patch) | |
| tree | f7d8d341e7938ef0e9899066622b944bc620b38b | |
| parent | 19c7238560644accd00c6ccd4497ef40142a06c2 (diff) | |
| parent | 959ff7f1c6412fe768a29ffe1d355f126dc9e80c (diff) | |
| download | cpython-c44d58a77a123873b093c4690056ef4d20e873f3.zip cpython-c44d58a77a123873b093c4690056ef4d20e873f3.tar.gz cpython-c44d58a77a123873b093c4690056ef4d20e873f3.tar.bz2 | |
Issue #29142: Merge 3.5.
| -rw-r--r-- | Lib/test/test_urllib.py | 3 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 43ea6b8..5084486 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -247,11 +247,12 @@ class ProxyTests(unittest.TestCase): def test_proxy_bypass_environment_host_match(self): bypass = urllib.request.proxy_bypass_environment self.env.set('NO_PROXY', - 'localhost, anotherdomain.com, newdomain.com:1234') + 'localhost, anotherdomain.com, newdomain.com:1234, .d.o.t') self.assertTrue(bypass('localhost')) self.assertTrue(bypass('LocalHost')) # MixedCase self.assertTrue(bypass('LOCALHOST')) # UPPERCASE self.assertTrue(bypass('newdomain.com:1234')) + self.assertTrue(bypass('foo.d.o.t')) # issue 29142 self.assertTrue(bypass('anotherdomain.com:8888')) self.assertTrue(bypass('www.newdomain.com:1234')) self.assertFalse(bypass('prelocalhost')) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 5f15b74..b6690c3 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2514,6 +2514,7 @@ def proxy_bypass_environment(host, proxies=None): no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')] for name in no_proxy_list: if name: + name = name.lstrip('.') # ignore leading dots name = re.escape(name) pattern = r'(.+\.)?%s$' % name if (re.match(pattern, hostonly, re.I) @@ -44,6 +44,10 @@ Core and Builtins Library ------- +- Issue #29142: In urllib.request, suffixes in no_proxy environment variable with + leading dots could match related hostnames again (e.g. .b.c matches a.b.c). + Patch by Milan Oberkirch. + - Issue #28961: Fix unittest.mock._Call helper: don't ignore the name parameter anymore. Patch written by Jiajun Huang. |