Mercurial > hg > nginx-site
changeset 397:f1c0ae9c1c48
FreeBSD 10.0-CURRENT supports the TCP_KEEPIDLE, TCP_KEEPINTVL, and
TCP_KEEPCNT socket options.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Tue, 07 Feb 2012 09:31:45 +0000 |
| parents | d5588cba3bf8 |
| children | 8548b80a4552 |
| files | xml/en/docs/http/ngx_http_core_module.xml xml/ru/docs/http/ngx_http_core_module.xml |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml Mon Feb 06 16:08:15 2012 +0000 +++ b/xml/en/docs/http/ngx_http_core_module.xml Tue Feb 07 09:31:45 2012 +0000 @@ -1133,7 +1133,8 @@ Some operating systems support tuning TCP keepalive parameters on a per-socket basis using the <c-def>TCP_KEEPIDLE</c-def>, <c-def>TCP_KEEPINTVL</c-def>, and <c-def>TCP_KEEPCNT</c-def> socket options. -On such systems (currently, Linux 2.4+ and NetBSD 5+) they can be configured +On such systems (currently, Linux 2.4+, NetBSD 5+, and +FreeBSD 10.0-CURRENT) they can be configured using the <value>keepidle</value>, <value>keepintvl</value>, and <value>keepcnt</value> parameters. One or two parameters may be omitted, in which case the system default setting
--- a/xml/ru/docs/http/ngx_http_core_module.xml Mon Feb 06 16:08:15 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_core_module.xml Tue Feb 07 09:31:45 2012 +0000 @@ -1116,7 +1116,8 @@ “TCP keepalive” на уровне сокета посредством опций <c-def>TCP_KEEPIDLE</c-def>, <c-def>TCP_KEEPINTVL</c-def> и <c-def>TCP_KEEPCNT</c-def>. -На таких системах (в настоящий момент это Linux 2.4+ и NetBSD 5+) +На таких системах (в настоящий момент это Linux 2.4+, NetBSD 5+ и +FreeBSD 10.0-CURRENT) их можно сконфигурировать с помощью параметров <value>keepidle</value>, <value>keepintvl</value> и <value>keepcnt</value>. Один или два параметра могут быть опущены, в таком случае для