diff Lib/SimpleHTTPServer.py @ 38828:03c05cab5f21 2.4

Bug #1117556: SimpleHTTPServer now tries to find and use the system's mime.types file for determining MIME types. (backport from rev. 46955)
author Georg Brandl <georg@python.org>
date Wed, 14 Jun 2006 08:50:05 +0000
parents da0995ca1f30
children
line wrap: on
line diff
--- a/Lib/SimpleHTTPServer.py	Wed Jun 14 08:31:41 2006 +0000
+++ b/Lib/SimpleHTTPServer.py	Wed Jun 14 08:50:05 2006 +0000
@@ -185,7 +185,9 @@
             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