Mercurial > hg > nginx-site

changeset 1625:0ba4b2e561bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added 502 error to the "queue" directive.
author Yaroslav Zhuravlev <yar@nginx.com>
date Thu, 17 Dec 2015 18:18:48 +0300
parents 46005596f221
children b6fad74f2aa1
files xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 2 files changed, 6 insertions(+), 4 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="44">
+        rev="45">
 
 <section id="summary">
 
@@ -916,7 +916,8 @@ at the same time.
 If the queue is filled up,
 or the server to pass the request to cannot be selected within
 the time period specified in the <literal>timeout</literal> parameter,
-an error will be returned to the client.
+the <http-status code="502" text="Bad Gateway"/>
+error will be returned to the client.
 </para>
 
 <para>
--- 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="44">
+        rev="45">
 
 <section id="summary">
 
@@ -921,7 +921,8 @@ match server_ok {
 Если очередь переполнена
 или за время, задаваемое параметром <literal>timeout</literal>,
 так и не удастся выбрать сервер для передачи ему запроса,
-клиенту будет возвращена ошибка.
+клиенту будет возвращена ошибка
+<http-status code="502" text="Bad Gateway"/>.
 </para>
 
 <para>