Mercurial > hg > nginx-site
changeset 2125:b19d5d47c16c
Documented ver.2 of the PROXY protocol.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Wed, 28 Mar 2018 22:21:53 +0300 |
parents | 2de0fcd46928 |
children | a969c7078bc4 |
files | xml/en/docs/http/ngx_http_core_module.xml xml/en/docs/stream/ngx_stream_core_module.xml xml/ru/docs/http/ngx_http_core_module.xml xml/ru/docs/stream/ngx_stream_core_module.xml |
diffstat | 4 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml Tue Mar 27 22:34:08 2018 +0300 +++ b/xml/en/docs/http/ngx_http_core_module.xml Wed Mar 28 22:21:53 2018 +0300 @@ -10,7 +10,7 @@ <module name="Module ngx_http_core_module" link="/en/docs/http/ngx_http_core_module.html" lang="en" - rev="76"> + rev="77"> <section id="directives" name="Directives"> @@ -1308,6 +1308,9 @@ allows specifying that all connections accepted on this port should use the <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">PROXY protocol</link>. +<note> +The PROXY protocol version 2 is supported since version 1.13.11. +</note> </para> <para>
--- a/xml/en/docs/stream/ngx_stream_core_module.xml Tue Mar 27 22:34:08 2018 +0300 +++ b/xml/en/docs/stream/ngx_stream_core_module.xml Wed Mar 28 22:21:53 2018 +0300 @@ -9,7 +9,7 @@ <module name="Module ngx_stream_core_module" link="/en/docs/stream/ngx_stream_core_module.html" lang="en" - rev="23"> + rev="24"> <section id="summary"> @@ -132,6 +132,9 @@ allows specifying that all connections accepted on this port should use the <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">PROXY protocol</link>. +<note> +The PROXY protocol version 2 is supported since version 1.13.11. +</note> </para> <para>
--- a/xml/ru/docs/http/ngx_http_core_module.xml Tue Mar 27 22:34:08 2018 +0300 +++ b/xml/ru/docs/http/ngx_http_core_module.xml Wed Mar 28 22:21:53 2018 +0300 @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_core_module" link="/ru/docs/http/ngx_http_core_module.html" lang="ru" - rev="76"> + rev="77"> <section id="directives" name="Директивы"> @@ -1302,6 +1302,9 @@ должны использовать <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">протокол PROXY</link>. +<note> +Протокол PROXY версии 2 поддерживается начиная с версии 1.13.11. +</note> </para> <para>
--- a/xml/ru/docs/stream/ngx_stream_core_module.xml Tue Mar 27 22:34:08 2018 +0300 +++ b/xml/ru/docs/stream/ngx_stream_core_module.xml Wed Mar 28 22:21:53 2018 +0300 @@ -9,7 +9,7 @@ <module name="Модуль ngx_stream_core_module" link="/ru/docs/stream/ngx_stream_core_module.html" lang="ru" - rev="23"> + rev="24"> <section id="summary"> @@ -132,6 +132,9 @@ должны использовать <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">протокол PROXY</link>. +<note> +Протокол PROXY версии 2 поддерживается начиная с версии 1.13.11. +</note> </para> <para>