sort media type extensions for text/html and image/jpeg as given in

/usr/share/misc/mime.types; do not include shtml as it is for Server
Side Includes (SSI) -- we will never do SSI.

joint work with reyk@

ok reyk@

diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index d9f46e6..dd9795c 100644 (file)
--- a/usr.sbin/httpd/httpd.conf.5
+++ b/usr.sbin/httpd/httpd.conf.5
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: httpd.conf.5,v 1.58 2015/05/19 18:03:32 sobrado Exp $
+.\"    $OpenBSD: httpd.conf.5,v 1.59 2015/05/19 18:12:58 sobrado Exp $
 .\"
 .\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org>
 .\"
@@ -452,10 +452,10 @@ server "default" {
 
 types {
        text/css                        css
-       text/html                       htm html
+       text/html                       html htm
        text/txt                        txt
        image/gif                       gif
-       image/jpeg                      jpg jpeg
+       image/jpeg                      jpeg jpg
        image/png                       png
        application/javascript          js
        application/xml                 xml