From aa27982ffca6ebfaad0a776e93e98a30e95b8b88 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 30 Apr 2016 01:03:40 +0000
Subject: Issue #26864: Fix case insensitivity and suffix comparison with
 no_proxy

Patch by Xiang Zhang.
---
 Lib/urllib/request.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Lib/urllib/request.py')

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index fc42d49a9f3..b28cd601583 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -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
 
-- 
cgit v1.2.3