summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2018-05-18 15:04:07 +0000
committerreyk <reyk@openbsd.org>2018-05-18 15:04:07 +0000
commite79099d8498ba52f21c034132c5ab6872c64ce07 (patch)
tree4b2a74834dd5aad26523ae261dd3d93af7e3d127 /usr.sbin/httpd
parentRevert previous: it introduced a shift/reduce conflict in the grammar. (diff)
downloadwireguard-openbsd-e79099d8498ba52f21c034132c5ab6872c64ce07.tar.xz
wireguard-openbsd-e79099d8498ba52f21c034132c5ab6872c64ce07.zip
Revert manpage description as well
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/httpd.conf.59
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index b86a4a11566..34cdfa54953 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.92 2018/05/18 14:24:26 reyk Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.93 2018/05/18 15:04:07 reyk Exp $
.\"
.\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -99,7 +99,7 @@ For example:
.Bd -literal -offset indent
ext_ip="10.0.0.1"
server "default" {
- listen on $ext_ip port 80
+ listen on $ext_ip
}
.Ed
.Sh GLOBAL CONFIGURATION
@@ -358,11 +358,8 @@ a browser's preload list.
Signal to the receiving user agent that this host and all sub domains
of the host's domain should be considered HSTS hosts.
.El
-.It Ic listen on Ar address Oo Ic tls Oc Op Ic port Ar number
+.It Ic listen on Ar address Oo Ic tls Oc Ic port Ar number
Set the listen address and port.
-The default port is 80, or 443 if HTTPS has been enabled with the
-.Ic tls
-keyword.
This statement can be specified multiple times.
.It Ic location Ar path Brq ...
Specify server configuration rules for a specific location.