summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2011-03-14 22:53:59 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2011-03-14 22:53:59 (GMT)
commit1aa999c49ed82c89257c13cba5e210c3ba34c130 (patch)
tree3a6f6056a91d86836552998b50d867a668482e63
parent19199830f7f880b1e9cff5d92d30706fd8bb4700 (diff)
downloadcpython-1aa999c49ed82c89257c13cba5e210c3ba34c130.zip
cpython-1aa999c49ed82c89257c13cba5e210c3ba34c130.tar.gz
cpython-1aa999c49ed82c89257c13cba5e210c3ba34c130.tar.bz2
Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
IP addresses in the proxy exception list.
-rw-r--r--Lib/urllib.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index 1553f9d..84e9dbc 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1396,7 +1396,7 @@ if sys.platform == 'darwin':
else:
mask = int(mask[1:])
- mask = 32 - mask
+ mask = 32 - mask
if (hostIP >> mask) == (base >> mask):
return True
diff --git a/Misc/NEWS b/Misc/NEWS
index 16ab295..af1ba7f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
Library
-------
+- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
+ IP addresses in the proxy exception list.
+
- Issue #11131: Fix sign of zero in plus and minus operations when
the context rounding mode is ROUND_FLOOR.