comparison mercurial/hgweb/server.py @ 3836:925b1816c746

Fix hg serve -6 getsockname handling
author Brendan Cully <brendan@kublai.com>
date Fri, 08 Dec 2006 17:10:40 -0800
parents eb0b4a2d70a9
children abaee83ce0a6 769be3c57564
comparison
equal deleted inserted replaced
3835:d1ce5461beed 3836:925b1816c746
199 self.webdirmaker = hgwebdir 199 self.webdirmaker = hgwebdir
200 self.repoviewmaker = hgweb 200 self.repoviewmaker = hgweb
201 self.reqmaker = wsgiapplication(self.make_handler) 201 self.reqmaker = wsgiapplication(self.make_handler)
202 self.daemon_threads = True 202 self.daemon_threads = True
203 203
204 addr, port = self.socket.getsockname() 204 addr, port = self.socket.getsockname()[:2]
205 if addr == '0.0.0.0': 205 if addr in ('0.0.0.0', '::'):
206 addr = socket.gethostname() 206 addr = socket.gethostname()
207 else: 207 else:
208 try: 208 try:
209 addr = socket.gethostbyaddr(addr)[0] 209 addr = socket.gethostbyaddr(addr)[0]
210 except socket.error: 210 except socket.error: