summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2013-11-26 10:43:06 +0000
committersthen <sthen@openbsd.org>2013-11-26 10:43:06 +0000
commit646bfd3e5de105a6ad1e5826e5e21ed7103e0521 (patch)
tree952da333d2769fa116b976720d0df2f291312514
parentInstead of comparing the lower and higher addresses of all the multicast (diff)
downloadwireguard-openbsd-646bfd3e5de105a6ad1e5826e5e21ed7103e0521.tar.xz
wireguard-openbsd-646bfd3e5de105a6ad1e5826e5e21ed7103e0521.zip
Copy some entries from Apache's mime.types file to nginx's, ok robert@
-rw-r--r--usr.sbin/nginx/conf/mime.types22
1 files changed, 21 insertions, 1 deletions
diff --git a/usr.sbin/nginx/conf/mime.types b/usr.sbin/nginx/conf/mime.types
index 6812842c6a6..854873a1615 100644
--- a/usr.sbin/nginx/conf/mime.types
+++ b/usr.sbin/nginx/conf/mime.types
@@ -1,4 +1,4 @@
-# $OpenBSD: mime.types,v 1.5 2012/10/30 13:00:35 ajacoutot Exp $
+# $OpenBSD: mime.types,v 1.6 2013/11/26 10:43:06 sthen Exp $
types {
text/html html htm shtml;
@@ -41,6 +41,7 @@ types {
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
+ application/x-ns-proxy-autoconfig pac;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
@@ -54,6 +55,24 @@ types {
application/xhtml+xml xhtml;
application/zip zip;
+ application/vnd.oasis.opendocument.chart odc;
+ application/vnd.oasis.opendocument.chart-template otc;
+ application/vnd.oasis.opendocument.database odb;
+ application/vnd.oasis.opendocument.formula odf;
+ application/vnd.oasis.opendocument.formula-template otf;
+ application/vnd.oasis.opendocument.graphics odg;
+ application/vnd.oasis.opendocument.graphics-template otg;
+ application/vnd.oasis.opendocument.image odi;
+ application/vnd.oasis.opendocument.image-template oti;
+ application/vnd.oasis.opendocument.presentation odp;
+ application/vnd.oasis.opendocument.presentation-template otp;
+ application/vnd.oasis.opendocument.spreadsheet ods;
+ application/vnd.oasis.opendocument.spreadsheet-template ots;
+ application/vnd.oasis.opendocument.text odt;
+ application/vnd.oasis.opendocument.text-master odm;
+ application/vnd.oasis.opendocument.text-template ott;
+ application/vnd.oasis.opendocument.text-web oth;
+
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
@@ -61,6 +80,7 @@ types {
application/octet-stream iso img;
application/octet-stream msi msp msm;
+ audio/basic au snd;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;