From 4af40d21737b073b09e491aa4923e2ae637817d7 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Fri, 1 May 2009 05:59:52 +0000 Subject: Fix for Issue1648102, based on the MSDN spec: If this parameter specifies the "" macro as the only entry, this function bypasses any host name that does not contain a period. --- Lib/urllib.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index db2b49e..a56f162 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1650,18 +1650,11 @@ elif os.name == 'nt': # '' string by the localhost entry and the corresponding # canonical entry. proxyOverride = proxyOverride.split(';') - i = 0 - while i < len(proxyOverride): - if proxyOverride[i] == '': - proxyOverride[i:i+1] = ['localhost', - '127.0.0.1', - socket.gethostname(), - socket.gethostbyname( - socket.gethostname())] - i += 1 - # print proxyOverride # now check if we match one of the registry values. for test in proxyOverride: + if test == '': + if '.' not in rawHost: + return 1 test = test.replace(".", r"\.") # mask dots test = test.replace("*", r".*") # change glob sequence test = test.replace("?", r".") # change glob char -- cgit v0.12