Mercurial > hg > nginx-site

changeset 2705:06805824d0f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented the keepalive_time directive.
author Yaroslav Zhuravlev <yar@nginx.com>
date Tue, 13 Apr 2021 15:05:16 +0100
parents 6ca9548f46e0
children 4f44386a16b1
files xml/en/docs/http/ngx_http_core_module.xml xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_core_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 4 files changed, 72 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml
+++ b/xml/en/docs/http/ngx_http_core_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_core_module"
         link="/en/docs/http/ngx_http_core_module.html"
         lang="en"
-        rev="93">
+        rev="94">
 
 <section id="directives" name="Directives">
 
@@ -950,6 +950,24 @@ could result in excessive memory usage a
 </directive>
 
 
+<directive name="keepalive_time">
+<syntax><value>time</value></syntax>
+<default>1h</default>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.19.10</appeared-in>
+
+<para>
+Limits the maximum time during which
+requests can be processed through one keep-alive connection.
+After this time is reached, the connection is closed
+following the subsequent request processing.
+</para>
+
+</directive>
+
+
 <directive name="keepalive_timeout">
 <syntax>
     <value>timeout</value>
--- 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="85">
+        rev="86">
 
 <section id="summary">
 
@@ -659,6 +659,22 @@ could result in excessive memory usage a
 </directive>
 
 
+<directive name="keepalive_time">
+<syntax><value>time</value></syntax>
+<default>1h</default>
+<context>upstream</context>
+<appeared-in>1.19.10</appeared-in>
+
+<para>
+Limits the maximum time during which
+requests can be processed through one keepalive connection.
+After this time is reached, the connection is closed
+following the subsequent request processing.
+</para>
+
+</directive>
+
+
 <directive name="keepalive_timeout">
 <syntax><value>timeout</value></syntax>
 <default>60s</default>
--- a/xml/ru/docs/http/ngx_http_core_module.xml
+++ b/xml/ru/docs/http/ngx_http_core_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_core_module"
         link="/ru/docs/http/ngx_http_core_module.html"
         lang="ru"
-        rev="93">
+        rev="94">
 
 <section id="directives" name="Директивы">
 
@@ -946,6 +946,24 @@ location = /404.html {
 </directive>
 
 
+<directive name="keepalive_time">
+<syntax><value>время</value></syntax>
+<default>1h</default>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.19.10</appeared-in>
+
+<para>
+Ограничивает максимальное время, в течение которого
+могут обрабатываться запросы в рамках keep-alive соединения.
+По достижении заданного времени соединение закрывается
+после обработки очередного запроса.
+</para>
+
+</directive>
+
+
 <directive name="keepalive_timeout">
 <syntax>
     <value>таймаут</value>
--- 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="85">
+        rev="86">
 
 <section id="summary">
 
@@ -668,6 +668,22 @@ server {
 </directive>
 
 
+<directive name="keepalive_time">
+<syntax><value>время</value></syntax>
+<default>1h</default>
+<context>upstream</context>
+<appeared-in>1.19.10</appeared-in>
+
+<para>
+Ограничивает максимальное время, в течение которого
+могут обрабатываться запросы в рамках постоянного соединения.
+По достижении заданного времени соединение закрывается
+после обработки очередного запроса.
+</para>
+
+</directive>
+
+
 <directive name="keepalive_timeout">
 <syntax><value>таймаут</value></syntax>
 <default>60s</default>