diff options
| author | Georg Brandl <georg@python.org> | 2006-06-14 08:50:05 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-06-14 08:50:05 +0000 |
| commit | d7d903af232a4e2bb69a180a5f286e77ca29ba62 (patch) | |
| tree | a72ec9b356c28e2987fbfba15d486da248d1bbbb /Lib/SimpleHTTPServer.py | |
| parent | c190b6631b49c39ce6aa86320a5179db06e2a440 (diff) | |
| download | cpython-git-d7d903af232a4e2bb69a180a5f286e77ca29ba62.tar.gz | |
Bug #1117556: SimpleHTTPServer now tries to find and use the system's
mime.types file for determining MIME types.
(backport from rev. 46955)
Diffstat (limited to 'Lib/SimpleHTTPServer.py')
| -rw-r--r-- | Lib/SimpleHTTPServer.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/SimpleHTTPServer.py b/Lib/SimpleHTTPServer.py index fe0c46653f..482d189317 100644 --- 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 |