Mercurial > hg > nginx-site
diff xml/en/docs/http/ngx_http_upstream_module.xml @ 1800:9d722e4153ab
Documented the "max_conns" parameter as opensource.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Wed, 28 Sep 2016 20:25:42 +0300 |
parents | 031566771bbd |
children | 592f9fa804f6 |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml Wed Sep 28 20:18:15 2016 +0300 +++ b/xml/en/docs/http/ngx_http_upstream_module.xml Wed Sep 28 20:25:42 2016 +0300 @@ -10,7 +10,7 @@ <module name="Module ngx_http_upstream_module" link="/en/docs/http/ngx_http_upstream_module.html" lang="en" - rev="49"> + rev="50"> <section id="summary"> @@ -150,6 +150,27 @@ sets the weight of the server, by default, 1. </tag-desc> +<tag-name id="max_conns"> +<literal>max_conns</literal>=<value>number</value> +</tag-name> +<tag-desc> +limits the maximum <value>number</value> of simultaneous active +connections to the proxied server (1.11.5). +Default value is zero, meaning there is no limit. +<note> +When <link id="keepalive"/> connections and multiple +<link doc="../ngx_core_module.xml" id="worker_processes">workers</link> +are enabled, +the total number of connections to the proxied server +may exceed the <literal>max_conns</literal> value. +</note> +<note> +Since version 1.5.9 and prior to version 1.11.5, +this parameter was available as part of our +<commercial_version>commercial subscription</commercial_version>. +</note> +</tag-desc> + <tag-name id="max_fails"> <literal>max_fails</literal>=<value>number</value> </tag-name> @@ -213,22 +234,6 @@ <commercial_version>commercial subscription</commercial_version>: <list type="tag"> -<tag-name id="max_conns"> -<literal>max_conns</literal>=<value>number</value> -</tag-name> -<tag-desc> -limits the maximum <value>number</value> of simultaneous active -connections to the proxied server (1.5.9). -Default value is zero, meaning there is no limit. -<note> -When <link id="keepalive"/> connections and multiple -<link doc="../ngx_core_module.xml" id="worker_processes">workers</link> -are enabled, -the total number of connections to the proxied server -may exceed the <literal>max_conns</literal> value. -</note> -</tag-desc> - <tag-name id="resolve"> <literal>resolve</literal> </tag-name>