Set UTF-8 charset in Content-Type in the serve command

Resolves #1966.
getnikola · Aug 23, 2015 · a955f96 · a955f96
1 parent c69770f
commit a955f96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -7,6 +7,11 @@ Features
 * New ``TAG_PAGES_TITLES`` and ``CATEGORY_PAGES_TITLES`` options
   (Issue #1962)
 
+Bugixes
+-------
+
+* Set UTF-8 charset in Content-Type or text/* and *+xml (Issue #1966)
+
 New in v7.6.4
 =============
 

diff --git a/nikola/plugins/command/serve.py b/nikola/plugins/command/serve.py
@@ -242,7 +242,10 @@ def send_head(self):
             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')