From 80c77acf9dbe3f435b821e1dc758acfa14d73844 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Mon, 25 Aug 2014 14:27:54 +0000
Subject: [PATCH] Add a generic system-wide /usr/share/misc/mime.types file
 that can be included in httpd.conf.  httpd(8) now supports both mime.types
 flavours with or without semicolon at the end of the line (nginx- or
 apache-style).

Discussed with many, with input from halex@
OK halex@
---
 src/etc/examples/httpd.conf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/etc/examples/httpd.conf b/src/etc/examples/httpd.conf
index f8364fd3..71496a4f 100644
--- a/src/etc/examples/httpd.conf
+++ b/src/etc/examples/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.10 2014/08/06 20:29:54 reyk Exp $
+# $OpenBSD: httpd.conf,v 1.11 2014/08/25 14:27:54 reyk Exp $
 
 #
 # Macros
@@ -70,3 +70,8 @@ server "ipv6.example.com" {
 	listen on 2001:db8::53f6:3eab port 81
 	root "/htdocs/ipv6.example.com"
 }
+
+# Include MIME types instead of the built-in ones
+types {
+	include "/usr/share/misc/mime.types"
+}