[Python-checkins] r72155 - python/trunk/Lib/urllib.py

Fri May 1 07:59:54 CEST 2009

Author: senthil.kumaran
Date: Fri May 1 07:59:52 2009
New Revision: 72155
Log:
Fix for Issue1648102, based on the MSDN spec: If this parameter specifies the
"<local>" macro as the only entry, this function bypasses any host name that
does not contain a period.
Modified:
 python/trunk/Lib/urllib.py
Modified: python/trunk/Lib/urllib.py
==============================================================================

--- python/trunk/Lib/urllib.py	(original)
+++ python/trunk/Lib/urllib.py	Fri May 1 07:59:52 2009
@@ -1650,18 +1650,11 @@
 # '<local>' string by the localhost entry and the corresponding
 # canonical entry.
 proxyOverride = proxyOverride.split(';')
- i = 0
- while i < len(proxyOverride):
- if proxyOverride[i] == '<local>':
- 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 == '<local>':
+ 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
