Support CIDR proxy overrides on Windows

Author: HeroCC

Lib/test/test_urllib2.py

@@ -1552,6 +1552,17 @@ def test_winreg_proxy_bypass(self):
                             "expect <local> to bypass intranet address '%s'"
                             % host)
 
+        # check IP CIDR bypass
+        proxy_override = "192.168.0.0/16; 2001:db8::/32"
+        for host in ("192.168.1.1", "192.168.1.1:443",
+                     "2001:db8::1", "[2001:db8::1]:443"):
+            self.assertTrue(proxy_bypass(host, proxy_override),
+                            "expected bypass of %s to be true" % host)
+
+        for host in ("192.169.1.1", "2001:db9::1"):
+            self.assertFalse(proxy_bypass(host, proxy_override),
+                             "expected bypass of %s to be False" % host)
+
     @unittest.skipUnless(sys.platform == 'darwin', "only relevant for OSX")
     def test_osx_proxy_bypass(self):
         bypass = {

Lib/urllib/request.py

@@ -2054,10 +2054,11 @@ def _proxy_bypass_winreg_override(host, override):
     Internet settings proxy override registry value.
 
     An example of a proxy override value is:
-    "www.example.com;*.example.net; 192.168.0.1"
+    "www.example.com;*.example.net; 192.168.0.1; 192.168.0.0/16"
     """
     from fnmatch import fnmatch
 
+    host_ip = _ip_address_from_host(host)
     host, _ = _splitport(host)
     proxy_override = override.split(';')
     for test in proxy_override:
@@ -2066,6 +2067,8 @@ def _proxy_bypass_winreg_override(host, override):
         if test == '<local>':
             if '.' not in host:
                 return True
+        elif '/' in test and _is_ip_address_in_network(host_ip, test):
+            return True
         elif fnmatch(host, test):
             return True
     return False