# HG changeset patch
# User Yaroslav Zhuravlev <yar@nginx.com>
# Date 1534931066 -10800
# Node ID a692df6ef3041ffcee0f0b96621af649eaba61c8
# Parent  0974dc0a6209b14c459fbc82f3739d6891b7ba7c
Added upstream keepalive_timeout and keepalive_requests.

diff --git a/xml/en/docs/http/ngx_http_upstream_module.xml b/xml/en/docs/http/ngx_http_upstream_module.xml
--- 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="73">
+        rev="74">
 
 <section id="summary">
 
@@ -642,6 +642,35 @@ SCGI and uwsgi protocols do not have a n
 </directive>
 
 
+<directive name="keepalive_requests">
+<syntax><value>number</value></syntax>
+<default>100</default>
+<context>upstream</context>
+<appeared-in>1.15.3</appeared-in>
+
+<para>
+Sets the maximum number of requests that can be
+served through one keep-alive connection.
+After the maximum number of requests is made, the connection is closed.
+</para>
+
+</directive>
+
+
+<directive name="keepalive_timeout">
+<syntax><value>timeout</value></syntax>
+<default>60s</default>
+<context>upstream</context>
+<appeared-in>1.15.3</appeared-in>
+
+<para>
+Sets a timeout during which a keep-alive
+connection to an upstream server will stay open.
+</para>
+
+</directive>
+
+
 <directive name="ntlm">
 <syntax/>
 <default/>
diff --git a/xml/ru/docs/http/ngx_http_upstream_module.xml b/xml/ru/docs/http/ngx_http_upstream_module.xml
--- 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="73">
+        rev="74">
 
 <section id="summary">
 
@@ -650,6 +650,36 @@ server {
 </directive>
 
 
+<directive name="keepalive_requests">
+<syntax><value>число</value></syntax>
+<default>100</default>
+<context>upstream</context>
+<appeared-in>1.15.3</appeared-in>
+
+<para>
+Задаёт максимальное число запросов, которые можно
+сделать по одному keep-alive соединению.
+После того как сделано максимальное число запросов,
+соединение закрывается.
+</para>
+
+</directive>
+
+
+<directive name="keepalive_timeout">
+<syntax><value>таймаут</value></syntax>
+<default>60s</default>
+<context>upstream</context>
+<appeared-in>1.15.3</appeared-in>
+
+<para>
+Задаёт таймаут, в течение которого keep-alive
+соединение с сервером группы не будет закрыто.
+</para>
+
+</directive>
+
+
 <directive name="ntlm">
 <syntax/>
 <default/>