diff options
author | Reyk Floeter <reyk@esdenera.com> | 2015-01-18 15:07:18 +0100 |
---|---|---|
committer | Reyk Floeter <reyk@esdenera.com> | 2015-01-18 15:07:18 +0100 |
commit | 56cddace6a66b505f8e47b7117290ab1214aa84a (patch) | |
tree | 4ac8affa66b5811f8791c3c371dc05c8d3c8cbc9 /httpd.conf.5 | |
parent | faa9e65a23cdb2e3971b36d7a22fb9d04dabb52c (diff) | |
download | httpd-56cddace6a66b505f8e47b7117290ab1214aa84a.tar.gz httpd-56cddace6a66b505f8e47b7117290ab1214aa84a.zip |
sync with -current:
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'httpd.conf.5')
-rw-r--r-- | httpd.conf.5 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/httpd.conf.5 b/httpd.conf.5 index 2f10a73..08efe74 100644 --- a/httpd.conf.5 +++ b/httpd.conf.5 @@ -1,6 +1,6 @@ -.\" $OpenBSD: httpd.conf.5,v 1.43 2015/01/05 11:03:57 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.44 2015/01/13 09:21:15 reyk Exp $ .\" -.\" Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> +.\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org> .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -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: January 5 2015 $ +.Dd $Mdocdate: January 13 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME |