Bug #1117556: SimpleHTTPServer now tries to find and use the system's

mime.types file for determining MIME types.
 (backport from rev. 46955)

diff --git a/Lib/SimpleHTTPServer.py b/Lib/SimpleHTTPServer.py
index fe0c46653f4a81bf7d389f3ad353d9d9739f7df1..482d189317d0221ff7b01d64f18f9dd2ab056e5b 100644 (file)
--- a/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@ -185,7 +185,9 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             return self.extensions_map[ext]
         else:
             return self.extensions_map['']
-
+    
+    if not mimetypes.inited:
+        mimetypes.init() # try to read system mime.types
     extensions_map = mimetypes.types_map.copy()
     extensions_map.update({
         '': 'application/octet-stream', # Default

diff --git a/Misc/NEWS b/Misc/NEWS
index 691d20981f87f59f530b98fbc9d019bec9565425..a4c1864c2b3589c7a964ba340a61a016dd89282a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,9 @@ Extension Modules
 Library
 -------
 
+- Bug #1117556: SimpleHTTPServer now tries to find and use the system's
+  mime.types file for determining MIME types.
+
 - Bug #1339007: Shelf objects now don't raise an exception in their
   __del__ method when initialization failed.