Mercurial > hg > nginx-site

changeset 2678:a4d3e6db81b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented the "proxy_protocol" directive in mail.
author Yaroslav Zhuravlev <yar@nginx.com>
date Wed, 10 Mar 2021 20:36:35 +0000
parents 3760176ba83e
children 8f3e9ff2785f
files xml/en/docs/mail/ngx_mail_proxy_module.xml xml/ru/docs/mail/ngx_mail_proxy_module.xml
diffstat 2 files changed, 34 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/mail/ngx_mail_proxy_module.xml
+++ b/xml/en/docs/mail/ngx_mail_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_mail_proxy_module"
         link="/en/docs/mail/ngx_mail_proxy_module.html"
         lang="en"
-        rev="4">
+        rev="5">
 
 <section id="directives" name="Directives">
 
@@ -75,6 +75,22 @@ The directive should be enabled in this 
 </directive>
 
 
+<directive name="proxy_protocol">
+<syntax><literal>on</literal> | <literal>off</literal></syntax>
+<default>off</default>
+<context>mail</context>
+<context>server</context>
+<appeared-in>1.19.8</appeared-in>
+
+<para>
+Enables the
+<link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">PROXY
+protocol</link> for connections to a backend.
+</para>
+
+</directive>
+
+
 <directive name="proxy_smtp_auth">
 <syntax><literal>on</literal> | <literal>off</literal></syntax>
 <default>off</default>
--- a/xml/ru/docs/mail/ngx_mail_proxy_module.xml
+++ b/xml/ru/docs/mail/ngx_mail_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_mail_proxy_module"
         link="/ru/docs/mail/ngx_mail_proxy_module.html"
         lang="ru"
-        rev="4">
+        rev="5">
 
 <section id="directives" name="Директивы">
 
@@ -75,6 +75,22 @@
 </directive>
 
 
+<directive name="proxy_protocol">
+<syntax><literal>on</literal> | <literal>off</literal></syntax>
+<default>off</default>
+<context>mail</context>
+<context>server</context>
+<appeared-in>1.19.8</appeared-in>
+
+<para>
+Включает
+<link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">протокол
+PROXY</link> для соединений с бэкендом.
+</para>
+
+</directive>
+
+
 <directive name="proxy_smtp_auth">
 <syntax><literal>on</literal> | <literal>off</literal></syntax>
 <default>off</default>