summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorIgor Sobrado <sobrado@cvs.openbsd.org>2015-05-19 18:12:59 +0000
committerIgor Sobrado <sobrado@cvs.openbsd.org>2015-05-19 18:12:59 +0000
commitbfb311a2050b6db2527c38117c9a0cae9215b694 (patch)
tree1d7a92244299d3c52b03913e4e87d1f9d8c1ff8c /usr.sbin
parentc12af599efb9766e1708cb1353b026ab103773c8 (diff)
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@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/httpd/httpd.conf.56
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index d9f46e69785..dd9795ce15f 100644
--- 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