summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2019-04-16 20:52:47 +0000
committerjmc <jmc@openbsd.org>2019-04-16 20:52:47 +0000
commit92c8aa79362885dd6d9396ba465e241d59aae060 (patch)
tree275fc208f8bd5de016918182fbcda156e3592b81 /usr.sbin/httpd
parentRewrite & fix X509V3_add_value() (diff)
downloadwireguard-openbsd-92c8aa79362885dd6d9396ba465e241d59aae060.tar.xz
wireguard-openbsd-92c8aa79362885dd6d9396ba465e241d59aae060.zip
document where multiline {} is applicable;
lack of documentation and original diff provided by alfred morgan; benno helped me track down the applicable options; ok benno
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/httpd.conf.513
1 files changed, 10 insertions, 3 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index 457847cd0a2..0b221d0fa4a 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.104 2019/03/12 21:38:56 jmc Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.105 2019/04/16 20:52:47 jmc Exp $
.\"
.\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 12 2019 $
+.Dd $Mdocdate: April 16 2019 $
.Dt HTTPD.CONF 5
.Os
.Sh NAME
@@ -234,6 +234,7 @@ option.
.El
.It Ic connection Ar option
Set the specified options and limits for HTTP connections.
+Multiple options may be specified within curly braces.
Valid options are:
.Bl -tag -width Ds
.It Ic max request body Ar number
@@ -260,6 +261,7 @@ Set the default media type for the specified location,
overwriting the global setting.
.It Ic directory Ar option
Set the specified options when serving or accessing directories.
+Multiple options may be specified within curly braces.
Valid options are:
.Bl -tag -width Ds
.It Oo Ic no Oc Ic auto index
@@ -430,6 +432,7 @@ but can be changed per server or location.
Use the
.Ic no log
directive to disable logging of any requests.
+Multiple options may be specified within curly braces.
Valid options are:
.Bl -tag -width Ds
.It Ic access Ar name
@@ -478,6 +481,7 @@ Disable any previous
in a location.
.It Ic request Ar option
Configure the options for the request path.
+Multiple options may be specified within curly braces.
Valid options are:
.Bl -tag -width Ds
.It Oo Ic no Oc Ic rewrite Ar path
@@ -515,6 +519,7 @@ Enable or disable the specified TCP/IP options; see
and
.Xr ip 4
for more information about the options.
+Multiple options may be specified within curly braces.
Valid options are:
.Bl -tag -width Ds
.It Ic backlog Ar number
@@ -544,6 +549,7 @@ This will affect the TCP window size.
.It Ic tls Ar option
Set the TLS configuration for the server.
These options are only used if TLS has been enabled via the listen directive.
+Multiple options may be specified within curly braces.
Valid options are:
.Bl -tag -width Ds
.It Ic certificate Ar file
@@ -658,7 +664,8 @@ and
.Pp
The
.Ic types
-section must include one or more lines of the following syntax:
+section must include one or more lines of the following syntax,
+enclosed in curly braces:
.Bl -tag -width Ds
.It Ar type/subtype Ar name Op Ar name ...
Set the media