mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 12:45:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

updated occurences of fqdn algorithm (closes patch #101197)

Browse source
This commit is contained in:
Peter Schneider-Kamp 2000-08-16 20:30:21 +00:00
parent 77c9f50422
commit 2d2785aad1
3 changed files with 8 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/BaseHTTPServer.py
View file

@ -93,19 +93,7 @@ class HTTPServer(SocketServer.TCPServer):
"""Override server_bind to store the server name."""
SocketServer.TCPServer.server_bind(self)
host, port = self.socket.getsockname()
if not host or host == '0.0.0.0':
host = socket.gethostname()
try:
hostname, hostnames, hostaddrs = socket.gethostbyaddr(host)
except socket.error:
hostname = host
else:
if '.' not in hostname:
for host in hostnames:
if '.' in host:
hostname = host
break
self.server_name = hostname
self.server_name = socket.getfqdn(host)
self.server_port = port
@ -418,16 +406,8 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
"""
(host, port) = self.client_address
try:
name, names, addresses = socket.gethostbyaddr(host)
except socket.error, msg:
return host
names.insert(0, name)
for name in names:
if '.' in name: return name
return names[0]
host, port = self.client_address
return socket.getfqdn(host)
# Essentially static class variables