commit 5a9a5080cf26712160efa79e932e2eeca59437bc
author Senthil Kumaran <orsenthil@gmail.com> Thu Mar 17 14:43:21 2011 +0800
committer Senthil Kumaran <orsenthil@gmail.com> Thu Mar 17 14:43:21 2011 +0800
tree a5243cc783899a445cdb971d6fb96e3fed9b245d
parent 2e617307bc530b709279926a122d7d58a0a63566
parent 020d3d985698aac55383eb1a309fd6d281f58a97

branch merge.

Lib/SimpleHTTPServer.py

diff --git a/Lib/SimpleHTTPServer.py b/Lib/SimpleHTTPServer.py
index 0110da0..3e0334d 100644
--- a/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@ -15,6 +15,7 @@
 import BaseHTTPServer
 import urllib
 import cgi
+import sys
 import shutil
 import mimetypes
 try:
@@ -131,7 +132,8 @@
         length = f.tell()
         f.seek(0)
         self.send_response(200)
-        self.send_header("Content-type", "text/html")
+        encoding = sys.getfilesystemencoding()
+        self.send_header("Content-type", "text/html; charset=%s" % encoding)
         self.send_header("Content-Length", str(length))
         self.end_headers()
         return f