From 1f63670a2a0e66c049c2cfe8a2ec62a663e5c754 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 18 Feb 2006 23:10:23 +0000 Subject: [PATCH] Patch #1426648: urllib proxy_bypass broken --- Lib/urllib.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index e1fa743828..aeca3f1007 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1403,13 +1403,20 @@ elif os.name == 'nt': if not proxyEnable or not proxyOverride: return 0 # try to make a host list from name and IP address. - host = [host] + rawHost, port = splitport(host) + host = [rawHost] try: - addr = socket.gethostbyname(host[0]) - if addr != host: + addr = socket.gethostbyname(rawHost) + if addr != rawHost: host.append(addr) except socket.error: pass + try: + fqdn = socket.getfqdn(rawHost) + if fqdn != rawHost: + host.append(fqdn) + except socket.error: + pass # make a check value list from the registry entry: replace the # '' string by the localhost entry and the corresponding # canonical entry. -- 2.40.0