changeset 1298:c459ca97c14d

Updated description of $proxy_host and $proxy_port variables.
author Yaroslav Zhuravlev <yar@nginx.com>
date Tue, 23 Sep 2014 14:32:03 +0400
parents 4eedb69b6156
children 4432674b0686
files xml/en/docs/http/ngx_http_proxy_module.xml xml/ru/docs/http/ngx_http_proxy_module.xml
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_proxy_module.xml	Fri Sep 19 19:45:27 2014 +0400
+++ b/xml/en/docs/http/ngx_http_proxy_module.xml	Tue Sep 23 14:32:03 2014 +0400
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_proxy_module"
         link="/en/docs/http/ngx_http_proxy_module.html"
         lang="en"
-        rev="24">
+        rev="25">
 
 <section id="summary">
 
@@ -1809,10 +1809,12 @@
 <list type="tag">
 
 <tag-name id="var_proxy_host"><var>$proxy_host</var></tag-name>
-<tag-desc>name and port of a proxied server;</tag-desc>
+<tag-desc>name and port of a proxied server as specified in the
+<link id="proxy_pass"/> directive;</tag-desc>
 
 <tag-name id="var_proxy_port"><var>$proxy_port</var></tag-name>
-<tag-desc>port of a proxied server;</tag-desc>
+<tag-desc>port of a proxied server as specified in the
+<link id="proxy_pass"/> directive, or the protocol’s default port;</tag-desc>
 
 <tag-name id="var_proxy_add_x_forwarded_for">
 <var>$proxy_add_x_forwarded_for</var></tag-name>
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml	Fri Sep 19 19:45:27 2014 +0400
+++ b/xml/ru/docs/http/ngx_http_proxy_module.xml	Tue Sep 23 14:32:03 2014 +0400
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_proxy_module"
         link="/ru/docs/http/ngx_http_proxy_module.html"
         lang="ru"
-        rev="24">
+        rev="25">
 
 <section id="summary">
 
@@ -1807,10 +1807,12 @@
 <list type="tag">
 
 <tag-name id="var_proxy_host"><var>$proxy_host</var></tag-name>
-<tag-desc>имя проксируемого хоста и порт;</tag-desc>
+<tag-desc>имя и порт проксируемого сервера, как указано в
+директиве <link id="proxy_pass"/>;</tag-desc>
 
 <tag-name id="var_proxy_port"><var>$proxy_port</var></tag-name>
-<tag-desc>порт проксируемого хоста;</tag-desc>
+<tag-desc>порт проксируемого сервера, как указано в
+директиве <link id="proxy_pass"/>, или стандартный порт протокола;</tag-desc>
 
 <tag-name id="var_proxy_add_x_forwarded_for">
 <var>$proxy_add_x_forwarded_for</var></tag-name>