Imported Upstream version 7.7.3upstream/7.7.3

1 files changed, 9 insertions, 5 deletions

diff --git a/nikola/plugins/command/serve.py b/nikola/plugins/command/serve.py
index 0441c93..b647bb7 100644
--- a/nikola/plugins/command/serve.py
+++ b/nikola/plugins/command/serve.py
@@ -45,24 +45,23 @@ except ImportError:
 
 
 from nikola.plugin_categories import Command
-from nikola.utils import get_logger, STDERR_HANDLER
+from nikola.utils import dns_sd, get_logger, STDERR_HANDLER
 
 
 class IPv6Server(HTTPServer):
-
     """An IPv6 HTTPServer."""
 
     address_family = socket.AF_INET6
 
 
 class CommandServe(Command):
-
     """Start test server."""
 
     name = "serve"
     doc_usage = "[options]"
     doc_purpose = "start the test webserver"
     logger = None
+    dns_sd = None
 
     cmd_options = (
         {
@@ -152,14 +151,16 @@ class CommandServe(Command):
                         raise e
             else:
                 try:
+                    self.dns_sd = dns_sd(options['port'], (options['ipv6'] or '::' in options['address']))
                     httpd.serve_forever()
                 except KeyboardInterrupt:
                     self.logger.info("Server is shutting down.")
+                    if self.dns_sd:
+                        self.dns_sd.Reset()
                     return 130
 
 
 class OurHTTPRequestHandler(SimpleHTTPRequestHandler):
-
     """A request handler, modified for Nikola."""
 
     extensions_map = dict(SimpleHTTPRequestHandler.extensions_map)
@@ -242,7 +243,10 @@ class OurHTTPRequestHandler(SimpleHTTPRequestHandler):
             f.seek(0)
 
         self.send_response(200)
-        self.send_header("Content-type", ctype)
+        if ctype.startswith('text/') or ctype.endswith('+xml'):
+            self.send_header("Content-Type", "{0}; charset=UTF-8".format(ctype))
+        else:
+            self.send_header("Content-Type", ctype)
         if os.path.splitext(path)[1] == '.svgz':
             # Special handling for svgz to make it work nice with browsers.
             self.send_header("Content-Encoding", 'gzip')