Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/server.py @ 45046:dd3050227a84
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 06 Jul 2020 22:02:50 -0400 |
parents | 86a7b7abf28e b1a1702262c9 |
children | d4ba4d51f85f |
comparison
equal
deleted
inserted
replaced
45045:8403cc54bc83 | 45046:dd3050227a84 |
---|---|
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): |