summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-06-14 08:42:11 (GMT)
committerGeorg Brandl <georg@python.org>2006-06-14 08:42:11 (GMT)
commit0540be96f3b4f9fa684ee7ce4f9e777a169d8138 (patch)
tree300abe2d847246d53cc150d41a988ea3f4f4b498
parentc54173c2341ed7709ef059b4aadf9f5a2f9a2cb1 (diff)
downloadcpython-0540be96f3b4f9fa684ee7ce4f9e777a169d8138.zip
cpython-0540be96f3b4f9fa684ee7ce4f9e777a169d8138.tar.gz
cpython-0540be96f3b4f9fa684ee7ce4f9e777a169d8138.tar.bz2
Bug #1202018: add some common mime.types locations.
-rw-r--r--Lib/mimetypes.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index bee2ff7..b0d2f18 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -33,6 +33,10 @@ __all__ = [
knownfiles = [
"/etc/mime.types",
+ "/etc/httpd/mime.types", # Mac OS X
+ "/etc/httpd/conf/mime.types", # Apache
+ "/etc/apache/mime.types", # Apache 1
+ "/etc/apache2/mime.types", # Apache 2
"/usr/local/etc/httpd/conf/mime.types",
"/usr/local/lib/netscape/mime.types",
"/usr/local/etc/httpd/conf/mime.types", # Apache 1.2