Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/server.py @ 45034:b1a1702262c9 stable
py3: fix crash when server address is 0.0.0.0 (issue6362)
`socket.getfqdn()` assumes that the name is passed as `str` on Python 3 and
always returns `str` in this case. Mercurial passed `bytes` (but still expected
a `str` result), which worked by chance in many cases, except for e.g.
b'0.0.0.0', which was returned unchanged, breaking later code.
Instead of calling `socket.getfqdn()`, we can also use `self.server_name` from
the base `HTTPServer` class, which already stores the FQDN of the locally-bound
socket name (see `BaseHTTPServer.py` in the Python 2 stdlib and
`http/server.py` in the Python 3 stdlib).
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Fri, 03 Jul 2020 23:25:19 +0200 |
parents | 9f70512ae2cf |
children | dd3050227a84 |
comparison
equal
deleted
inserted
replaced
45031:383005aa9cdc | 45034:b1a1702262c9 |
---|---|
380 elog = openlog(ui.config(b'web', b'errorlog'), ui.ferr) | 380 elog = openlog(ui.config(b'web', b'errorlog'), ui.ferr) |
381 self.accesslog = alog | 381 self.accesslog = alog |
382 self.errorlog = elog | 382 self.errorlog = elog |
383 | 383 |
384 self.addr, self.port = self.socket.getsockname()[0:2] | 384 self.addr, self.port = self.socket.getsockname()[0:2] |
385 self.fqaddr = socket.getfqdn(addr[0]) | 385 self.fqaddr = self.server_name |
386 | 386 |
387 self.serverheader = ui.config(b'web', b'server-header') | 387 self.serverheader = ui.config(b'web', b'server-header') |
388 | 388 |
389 | 389 |
390 class IPv6HTTPServer(MercurialHTTPServer): | 390 class IPv6HTTPServer(MercurialHTTPServer): |