changeset 1125:9a95b9026a16

Upstream: reallocated the "queue" directive.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 21 Mar 2014 10:50:24 +0400
parents d790333947f4
children 2e28d1c4a0a2
files xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 2 files changed, 54 insertions(+), 54 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="16">
+        rev="17">
 
 <section id="summary">
 
@@ -744,6 +744,41 @@ This directive is available as part of o
 </directive>
 
 
+<directive name="queue">
+<syntax>
+<value>number</value>
+[<literal>timeout</literal>=<value>time</value>]</syntax>
+<default/>
+<context>upstream</context>
+<appeared-in>1.5.12</appeared-in>
+
+<para>
+If an upstream server cannot be selected immediately
+while processing a request,
+and there are the servers in the group that have reached the
+<link id="max_conns"/> limit,
+the request will be placed into the queue.
+The directive specifies the maximum number of requests that can be in the queue
+at the same time.
+If the queue is filled up,
+or the server to pass the request to cannot been selected within
+the time period specified in the <literal>timeout</literal> parameter,
+an error will be returned to the client.
+</para>
+
+<para>
+The default value of the <literal>timeout</literal> parameter is 60 seconds.
+</para>
+
+<para>
+<note>
+This directive is available as part of our <commercial_version/>.
+</note>
+</para>
+
+</directive>
+
+
 <directive name="sticky">
 <syntax><literal>cookie</literal> <value>name</value>
 [<literal>expires=</literal><value>time</value>]
@@ -885,41 +920,6 @@ An equivalent
 </directive>
 
 
-<directive name="queue">
-<syntax>
-<value>number</value>
-[<literal>timeout</literal>=<value>time</value>]</syntax>
-<default/>
-<context>upstream</context>
-<appeared-in>1.5.12</appeared-in>
-
-<para>
-If an upstream server cannot be selected immediately
-while processing a request,
-and there are the servers in the group that have reached the
-<link id="max_conns"/> limit,
-the request will be placed into the queue.
-The directive specifies the maximum number of requests that can be in the queue
-at the same time.
-If the queue is filled up,
-or the server to pass the request to cannot been selected within
-the time period specified in the <literal>timeout</literal> parameter,
-an error will be returned to the client.
-</para>
-
-<para>
-The default value of the <literal>timeout</literal> parameter is 60 seconds.
-</para>
-
-<para>
-<note>
-This directive is available as part of our <commercial_version/>.
-</note>
-</para>
-
-</directive>
-
-
 <directive name="upstream_conf">
 <syntax/>
 <default/>
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml
+++ b/xml/ru/docs/http/ngx_http_upstream_module.xml
@@ -414,6 +414,24 @@ server {
 </directive>
 
 
+<directive name="least_conn">
+<syntax/>
+<default/>
+<context>upstream</context>
+<appeared-in>1.3.1</appeared-in>
+<appeared-in>1.2.2</appeared-in>
+
+<para>
+Задаёт для группы метод балансировки нагрузки, при котором запрос
+передаётся серверу с наименьшим числом активных соединений,
+с учётом весов серверов.
+Если подходит сразу несколько серверов, они выбираются циклически
+(в режиме round-robin) с учётом их весов.
+</para>
+
+</directive>
+
+
 <directive name="queue">
 <syntax>
 <value>число</value>
@@ -447,24 +465,6 @@ server {
 
 </directive>
 
-
-<directive name="least_conn">
-<syntax/>
-<default/>
-<context>upstream</context>
-<appeared-in>1.3.1</appeared-in>
-<appeared-in>1.2.2</appeared-in>
-
-<para>
-Задаёт для группы метод балансировки нагрузки, при котором запрос
-передаётся серверу с наименьшим числом активных соединений,
-с учётом весов серверов.
-Если подходит сразу несколько серверов, они выбираются циклически
-(в режиме round-robin) с учётом их весов.
-</para>
-
-</directive>
-
 </section>