Mercurial > hg > nginx-site

changeset 1514:eef30c3dc519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented the "proxy_protocol" directive for stream.
author Yaroslav Zhuravlev <yar@nginx.com>
date Tue, 16 Jun 2015 16:38:52 +0300
parents 88d1a1d36c0c
children 259a48800748
files xml/en/docs/stream/ngx_stream_proxy_module.xml xml/ru/docs/stream/ngx_stream_proxy_module.xml
diffstat 2 files changed, 34 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/stream/ngx_stream_proxy_module.xml
+++ b/xml/en/docs/stream/ngx_stream_proxy_module.xml
@@ -9,7 +9,7 @@
 <module name="Module ngx_stream_proxy_module"
         link="/en/docs/stream/ngx_stream_proxy_module.html"
         lang="en"
-        rev="6">
+        rev="7">
 
 <section id="summary">
 
@@ -173,6 +173,22 @@ In addition, an address can be specified
 </directive>
 
 
+<directive name="proxy_protocol">
+<syntax><literal>on</literal> | <literal>off</literal></syntax>
+<default>off</default>
+<context>stream</context>
+<context>server</context>
+<appeared-in>1.9.2</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 proxied server.
+</para>
+
+</directive>
+
+
 <directive name="proxy_ssl">
 <syntax><literal>on</literal> | <literal>off</literal></syntax>
 <default>off</default>
--- a/xml/ru/docs/stream/ngx_stream_proxy_module.xml
+++ b/xml/ru/docs/stream/ngx_stream_proxy_module.xml
@@ -9,7 +9,7 @@
 <module name="Модуль ngx_stream_proxy_module"
         link="/ru/docs/stream/ngx_stream_proxy_module.html"
         lang="ru"
-        rev="6">
+        rev="7">
 
 <section id="summary">
 
@@ -173,6 +173,22 @@ proxy_pass unix:/tmp/stream.socket;
 </directive>
 
 
+<directive name="proxy_protocol">
+<syntax><literal>on</literal> | <literal>off</literal></syntax>
+<default>off</default>
+<context>stream</context>
+<context>server</context>
+<appeared-in>1.9.2</appeared-in>
+
+<para>
+Включает
+<link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">протокол
+PROXY</link> для соединений с проксируемым сервером.
+</para>
+
+</directive>
+
+
 <directive name="proxy_ssl">
 <syntax><literal>on</literal> | <literal>off</literal></syntax>
 <default>off</default>