From: Georg Brandl <georg@python.org>
Date: Wed, 14 Jun 2006 08:42:11 +0000 (+0000)
Subject: Bug #1202018: add some common mime.types locations.
X-Git-Tag: v2.5b1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0540be96f3b4f9fa684ee7ce4f9e777a169d8138;p=thirdparty%2FPython%2Fcpython.git

Bug #1202018: add some common mime.types locations.
---

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index bee2ff753475..b0d2f181728d 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