summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenning <henning@openbsd.org>2002-10-06 12:00:21 +0000
committerhenning <henning@openbsd.org>2002-10-06 12:00:21 +0000
commit4e7b7015c6380e4e4740e55d5cf1918dd728f40f (patch)
tree5b3d94a4ee61c6ce3e57627cc96ce2d026915606
parentExpand {} lists from left to right, so 'pass in from { a, b } to any' (diff)
downloadwireguard-openbsd-4e7b7015c6380e4e4740e55d5cf1918dd728f40f.tar.xz
wireguard-openbsd-4e7b7015c6380e4e4740e55d5cf1918dd728f40f.zip
in the commented out AddType example for php take values fitting for php4,
not php3. inspired by a PR from j@pureftpd.org for the -dist file.
-rw-r--r--usr.sbin/httpd/conf/httpd.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf
index ea945ec546a..6274a2dc486 100644
--- a/usr.sbin/httpd/conf/httpd.conf
+++ b/usr.sbin/httpd/conf/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.14 2002/09/20 08:20:21 henning Exp $
+# $OpenBSD: httpd.conf,v 1.15 2002/10/06 12:00:21 henning Exp $
#
# Based upon the NCSA server configuration files originally by Rob McCool.
#
@@ -669,11 +669,10 @@ LanguagePriority en fr de
# AddType allows you to tweak mime.types without actually editing it, or to
# make certain files to be certain types.
#
-# For example, the PHP3 module (not part of the Apache distribution)
+# For example, the PHP module (not part of the Apache distribution)
# will typically use:
#
-#AddType application/x-httpd-php3 .phtml
-#AddType application/x-httpd-php3-source .phps
+#AddType application/x-httpd-php .php
#
# AddHandler allows you to map certain file extensions to "handlers",