# HG changeset patch
# User Yaroslav Zhuravlev <yar@nginx.com>
# Date 1473782098 -10800
# Node ID 363249d888e1ac38dcdc45803e12db4cbe6b4853
# Parent  0aacc6cbc759dd96ed4ad3851242889794a3e704
Documented the "proxy_protocol_timeout" directive in stream.

diff -r 0aacc6cbc759 -r 363249d888e1 xml/en/docs/stream/ngx_stream_core_module.xml
--- a/xml/en/docs/stream/ngx_stream_core_module.xml	Tue Sep 13 18:46:47 2016 +0300
+++ b/xml/en/docs/stream/ngx_stream_core_module.xml	Tue Sep 13 18:54:58 2016 +0300
@@ -9,7 +9,7 @@
 <module name="Module ngx_stream_core_module"
         link="/en/docs/stream/ngx_stream_core_module.html"
         lang="en"
-        rev="19">
+        rev="20">
 
 <section id="summary">
 
@@ -235,6 +235,23 @@
 </directive>
 
 
+<directive name="proxy_protocol_timeout">
+<syntax><value>timeout</value></syntax>
+<default>30s</default>
+<context>stream</context>
+<context>server</context>
+<appeared-in>1.11.4</appeared-in>
+
+<para>
+Specifies a <value>timeout</value> for
+reading the PROXY protocol header to complete.
+If no entire header is transmitted within this time,
+the connection is closed.
+</para>
+
+</directive>
+
+
 <directive name="resolver">
 <syntax>
     <value>address</value> ...
diff -r 0aacc6cbc759 -r 363249d888e1 xml/ru/docs/stream/ngx_stream_core_module.xml
--- a/xml/ru/docs/stream/ngx_stream_core_module.xml	Tue Sep 13 18:46:47 2016 +0300
+++ b/xml/ru/docs/stream/ngx_stream_core_module.xml	Tue Sep 13 18:54:58 2016 +0300
@@ -9,7 +9,7 @@
 <module name="Модуль ngx_stream_core_module"
         link="/ru/docs/stream/ngx_stream_core_module.html"
         lang="ru"
-        rev="19">
+        rev="20">
 
 <section id="summary">
 
@@ -241,6 +241,23 @@
 </directive>
 
 
+<directive name="proxy_protocol_timeout">
+<syntax><value>время</value></syntax>
+<default>30s</default>
+<context>stream</context>
+<context>server</context>
+<appeared-in>1.11.4</appeared-in>
+
+<para>
+Задаёт <value>время</value> для
+завершения операции чтения заголовка протокола PROXY.
+Если по истечении этого времени заголовок полностью не получен,
+соединение закрывается.
+</para>
+
+</directive>
+
+
 <directive name="resolver">
 <syntax>
     <value>адрес</value> ...