diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-06-20 13:48:43 +0200 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-06-20 13:48:43 +0200 |
| commit | 43aa296392eea581bb39cdc1b3d0a282164c05c6 (patch) | |
| tree | 073401ba96ebb819435ced7268a791b80ec2864a /httpd/httpd.conf.5 | |
| parent | fbefc9a818a5ed612c0df918598057a8b551cb95 (diff) | |
| download | httpd-43aa296392eea581bb39cdc1b3d0a282164c05c6.tar.gz httpd-43aa296392eea581bb39cdc1b3d0a282164c05c6.zip | |
sync with -current
Diffstat (limited to 'httpd/httpd.conf.5')
| -rw-r--r-- | httpd/httpd.conf.5 | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/httpd/httpd.conf.5 b/httpd/httpd.conf.5 index 26d6798..87866d2 100644 --- a/httpd/httpd.conf.5 +++ b/httpd/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.57 2015/03/26 19:16:57 jmc Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.61 2015/05/28 19:29:40 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 26 2015 $ +.Dd $Mdocdate: May 28 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -152,7 +152,7 @@ Use the directive to disable authentication in a location. .It Ic block drop Drop the connection without sending an error page. -.It Ic block Op Ic return Ar code Op uri +.It Ic block Op Ic return Ar code Op Ar uri Close the connection and send an error page. If the optional return code is not specified, .Xr httpd 8 @@ -166,7 +166,7 @@ argument can be used with return codes in the 3xx range to send a header for redirection to a specified URI. .Pp The -.Ar url +.Ar uri may contain predefined macros that will be expanded at runtime: .Pp .Bl -tag -width $DOCUMENT_URI -offset indent -compact @@ -451,14 +451,14 @@ server "default" { } types { - text/css css - text/html htm html - text/txt txt - image/gif gif - image/jpeg jpg jpeg - image/png png - application/javascript js - application/xml xml + text/css css + text/html html htm + text/txt txt + image/gif gif + image/jpeg jpeg jpg + image/png png + application/javascript js + application/xml xml } .Ed .Pp @@ -514,14 +514,6 @@ server "www.example.com" { listen on 10.0.0.1 port 80 } .Ed -.Pp -The syntax of the types section is also compatible with the format -used by nginx, so it is possible to include its -.Pa mime.types -file directly: -.Bd -literal -offset indent -include "/etc/nginx/mime.types" -.Ed .Sh SEE ALSO .Xr htpasswd 1 , .Xr httpd 8 , |