mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch #1426648: urllib proxy_bypass broken

This commit is contained in:
Georg Brandl 2006-02-18 23:10:23 +00:00
parent 4caeff9867
commit 1f63670a2a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/urllib.py
View File

@ -1403,13 +1403,20 @@ def proxy_bypass(host):
if not proxyEnable or not proxyOverride: if not proxyEnable or not proxyOverride:
return 0 return 0
# try to make a host list from name and IP address. # try to make a host list from name and IP address.
host = [host] rawHost, port = splitport(host)
host = [rawHost]
try: try:
addr = socket.gethostbyname(host[0]) addr = socket.gethostbyname(rawHost)
if addr != host: if addr != rawHost:
host.append(addr) host.append(addr)
except socket.error: except socket.error:
pass 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 # make a check value list from the registry entry: replace the
# '<local>' string by the localhost entry and the corresponding # '<local>' string by the localhost entry and the corresponding
# canonical entry. # canonical entry.