Mercurial > hg > nginx-site

changeset 917:e26a18eb5ccd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented http_403 in proxy_next_upstream and friends.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 30 May 2013 12:29:42 +0400
parents 23082702f90d
children ae785c6aaa91
files xml/en/docs/http/ngx_http_fastcgi_module.xml xml/en/docs/http/ngx_http_proxy_module.xml xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_fastcgi_module.xml xml/ru/docs/http/ngx_http_proxy_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 6 files changed, 31 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_fastcgi_module.xml
+++ b/xml/en/docs/http/ngx_http_fastcgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_fastcgi_module"
         link="/en/docs/http/ngx_http_fastcgi_module.html"
         lang="en"
-        rev="7">
+        rev="8">
 
 <section id="summary">
 
@@ -331,6 +331,7 @@ A pause is made between iterations, conf
     <literal>updating</literal> |
     <literal>http_500</literal> |
     <literal>http_503</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -645,6 +646,7 @@ Value of zero disables buffering of resp
     <literal>invalid_header</literal> |
     <literal>http_500</literal> |
     <literal>http_503</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -674,6 +676,9 @@ server, passing it a request, or reading
 <tag-name><literal>http_503</literal></tag-name>
 <tag-desc>a server returned a response with the code 503;</tag-desc>
 
+<tag-name><literal>http_403</literal></tag-name>
+<tag-desc>a server returned a response with the code 403;</tag-desc>
+
 <tag-name><literal>http_404</literal></tag-name>
 <tag-desc>a server returned a response with the code 404;</tag-desc>
 
--- a/xml/en/docs/http/ngx_http_proxy_module.xml
+++ b/xml/en/docs/http/ngx_http_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_proxy_module"
         link="/en/docs/http/ngx_http_proxy_module.html"
         lang="en"
-        rev="10">
+        rev="11">
 
 <section id="summary">
 
@@ -374,6 +374,7 @@ A pause is made between iterations, conf
     <literal>http_502</literal> |
     <literal>http_503</literal> |
     <literal>http_504</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -827,6 +828,7 @@ to the proxied server instead of the met
     <literal>http_502</literal> |
     <literal>http_503</literal> |
     <literal>http_504</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -862,6 +864,9 @@ server, passing it a request, or reading
 <tag-name><literal>http_504</literal></tag-name>
 <tag-desc>a server returned a response with the code 504;</tag-desc>
 
+<tag-name><literal>http_403</literal></tag-name>
+<tag-desc>a server returned a response with the code 403;</tag-desc>
+
 <tag-name><literal>http_404</literal></tag-name>
 <tag-desc>a server returned a response with the code 404;</tag-desc>
 
--- a/xml/en/docs/http/ngx_http_upstream_module.xml
+++ b/xml/en/docs/http/ngx_http_upstream_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_upstream_module"
         link="/en/docs/http/ngx_http_upstream_module.html"
         lang="en"
-        rev="2">
+        rev="3">
 
 <section id="summary">
 
@@ -128,8 +128,9 @@ What is considered to be an unsuccessful
 <link doc="ngx_http_fastcgi_module.xml" id="fastcgi_next_upstream"/>, and
 <link doc="ngx_http_memcached_module.xml" id="memcached_next_upstream"/>
 directives.
-The <literal>http_404</literal> state is not considered
-an unsuccessful attempt.
+The <literal>http_403</literal>, <literal>http_404</literal>,
+and <literal>not_found</literal> states are not considered as
+unsuccessful attempts.
 </tag-desc>
 
 <tag-name><literal>fail_timeout</literal>=<value>time</value></tag-name>
--- a/xml/ru/docs/http/ngx_http_fastcgi_module.xml
+++ b/xml/ru/docs/http/ngx_http_fastcgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_fastcgi_module"
         link="/ru/docs/http/ngx_http_fastcgi_module.html"
         lang="ru"
-        rev="7">
+        rev="8">
 
 <section id="summary">
 
@@ -329,6 +329,7 @@ fastcgi_cache_path /data/nginx/cache lev
     <literal>updating</literal> |
     <literal>http_500</literal> |
     <literal>http_503</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -642,6 +643,7 @@ FastCGI-серверу оставлять соединения открытыми.
     <literal>invalid_header</literal> |
     <literal>http_500</literal> |
     <literal>http_503</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -671,6 +673,9 @@ FastCGI-серверу оставлять соединения открытыми.
 <tag-name><literal>http_503</literal></tag-name>
 <tag-desc>сервер вернул ответ с кодом 503;</tag-desc>
 
+<tag-name><literal>http_403</literal></tag-name>
+<tag-desc>сервер вернул ответ с кодом 403;</tag-desc>
+
 <tag-name><literal>http_404</literal></tag-name>
 <tag-desc>сервер вернул ответ с кодом 404;</tag-desc>
 
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml
+++ b/xml/ru/docs/http/ngx_http_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_proxy_module"
         link="/ru/docs/http/ngx_http_proxy_module.html"
         lang="ru"
-        rev="10">
+        rev="11">
 
 <section id="summary">
 
@@ -372,6 +372,7 @@ proxy_cache_path /data/nginx/cache level
     <literal>http_502</literal> |
     <literal>http_503</literal> |
     <literal>http_504</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -824,6 +825,7 @@ nginx не передаёт клиенту поля заголовка <header>Date</header>,
     <literal>http_502</literal> |
     <literal>http_503</literal> |
     <literal>http_504</literal> |
+    <literal>http_403</literal> |
     <literal>http_404</literal> |
     <literal>off</literal>
     ...</syntax>
@@ -859,6 +861,9 @@ nginx не передаёт клиенту поля заголовка <header>Date</header>,
 <tag-name><literal>http_504</literal></tag-name>
 <tag-desc>сервер вернул ответ с кодом 504;</tag-desc>
 
+<tag-name><literal>http_403</literal></tag-name>
+<tag-desc>сервер вернул ответ с кодом 403;</tag-desc>
+
 <tag-name><literal>http_404</literal></tag-name>
 <tag-desc>сервер вернул ответ с кодом 404;</tag-desc>
 
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml
+++ b/xml/ru/docs/http/ngx_http_upstream_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_upstream_module"
         link="/ru/docs/http/ngx_http_upstream_module.html"
         lang="ru"
-        rev="2">
+        rev="3">
 
 <section id="summary">
 
@@ -129,8 +129,8 @@ 5 запросов на <literal>backend1.example.com</literal>
 <link doc="ngx_http_proxy_module.xml" id="proxy_next_upstream"/>,
 <link doc="ngx_http_fastcgi_module.xml" id="fastcgi_next_upstream"/> и
 <link doc="ngx_http_memcached_module.xml" id="memcached_next_upstream"/>.
-Состояние <literal>http_404</literal>
-не считается неудачной попыткой.
+Состояния <literal>http_403</literal>, <literal>http_404</literal>
+и <literal>not_found</literal> не считаются неудачными попытками.
 </tag-desc>
 
 <tag-name><literal>fail_timeout</literal>=<value>время</value></tag-name>