Mercurial > hg > nginx-site
changeset 1385:f08ae1f79000
Documented the max_conns parameter in upstream_conf.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Mon, 12 Jan 2015 12:03:09 +0300 |
parents | 66ee77849563 |
children | d796c95f0922 |
files | xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml |
diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml +++ b/xml/en/docs/http/ngx_http_upstream_module.xml @@ -10,7 +10,7 @@ <module name="Module ngx_http_upstream_module" link="/en/docs/http/ngx_http_upstream_module.html" lang="en" - rev="29"> + rev="30"> <section id="summary"> @@ -1153,6 +1153,13 @@ of the <link id="server"/> directive. </tag-desc> <tag-name> +<literal>max_conns=</literal><value>number</value></tag-name> +<tag-desc> +Same as the “<literal>max_conns</literal>” parameter +of the <link id="server"/> directive. +</tag-desc> + +<tag-name> <literal>slow_start=</literal><value>time</value></tag-name> <tag-desc> Same as the “<literal>slow_start</literal>” parameter
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_upstream_module" link="/ru/docs/http/ngx_http_upstream_module.html" lang="ru" - rev="29"> + rev="30"> <section id="summary"> @@ -1160,6 +1160,13 @@ http://127.0.0.1/upstream_conf?upstream= </tag-desc> <tag-name> +<literal>max_conns=</literal><value>число</value></tag-name> +<tag-desc> +То же, что и параметр “<literal>max_conns</literal>” +директивы <link id="server"/>. +</tag-desc> + +<tag-name> <literal>slow_start=</literal><value>время</value></tag-name> <tag-desc> То же, что и параметр “<literal>slow_start</literal>”