equal
deleted
inserted
replaced
229 def _done(self): |
229 def _done(self): |
230 if self._chunked: |
230 if self._chunked: |
231 self.wfile.write('0\r\n\r\n') |
231 self.wfile.write('0\r\n\r\n') |
232 self.wfile.flush() |
232 self.wfile.flush() |
233 |
233 |
|
234 def version_string(self): |
|
235 if self.server.serverheader: |
|
236 return self.server.serverheader |
|
237 return httpservermod.basehttprequesthandler.version_string(self) |
|
238 |
234 class _httprequesthandlerssl(_httprequesthandler): |
239 class _httprequesthandlerssl(_httprequesthandler): |
235 """HTTPS handler based on Python's ssl module""" |
240 """HTTPS handler based on Python's ssl module""" |
236 |
241 |
237 url_scheme = 'https' |
242 url_scheme = 'https' |
238 |
243 |
302 self.errorlog = elog |
307 self.errorlog = elog |
303 |
308 |
304 self.addr, self.port = self.socket.getsockname()[0:2] |
309 self.addr, self.port = self.socket.getsockname()[0:2] |
305 self.fqaddr = socket.getfqdn(addr[0]) |
310 self.fqaddr = socket.getfqdn(addr[0]) |
306 |
311 |
|
312 self.serverheader = ui.config('web', 'server-header') |
|
313 |
307 class IPv6HTTPServer(MercurialHTTPServer): |
314 class IPv6HTTPServer(MercurialHTTPServer): |
308 address_family = getattr(socket, 'AF_INET6', None) |
315 address_family = getattr(socket, 'AF_INET6', None) |
309 def __init__(self, *args, **kwargs): |
316 def __init__(self, *args, **kwargs): |
310 if self.address_family is None: |
317 if self.address_family is None: |
311 raise error.RepoError(_('IPv6 is not available on this system')) |
318 raise error.RepoError(_('IPv6 is not available on this system')) |