mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 05:31:20 +00:00 
			
		
		
		
	Patch #1426648: urllib proxy_bypass broken
This commit is contained in:
		
							parent
							
								
									4caeff9867
								
							
						
					
					
						commit
						1f63670a2a
					
				
					 1 changed files with 10 additions and 3 deletions
				
			
		|  | @ -1403,13 +1403,20 @@ def proxy_bypass(host): | |||
|         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 | ||||
|         # '<local>' string by the localhost entry and the corresponding | ||||
|         # canonical entry. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Georg Brandl
						Georg Brandl