diff xml/en/docs/http/ngx_http_proxy_module.xml @ 1912:ec4af97e4403

Split off header options from parameters in proxy_cache_use_stale and friends.
author Yaroslav Zhuravlev <yar@nginx.com>
date Tue, 21 Feb 2017 21:23:53 +0300
parents 41cf2c2d8c5c
children 66a30a380fba
line wrap: on
line diff
--- 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="56">
+        rev="57">
 
 <section id="summary">
 
@@ -649,11 +649,6 @@ The directive’s parameters match the parameters of the
 The <literal>error</literal> parameter also permits
 using a stale cached response if a proxied server to process a request
 cannot be selected.
-The same behavior can be enabled with the
-“<link url="https://tools.ietf.org/html/rfc5861#section-4">stale-if-error</link>”
-extension of the <header>Cache-Control</header> response header field (1.11.10)
-for a specified number of seconds after the response became stale,
-however, this has lower priority than using the directive parameter.
 </para>
 
 <para id="proxy_cache_use_stale_updating">
@@ -661,11 +656,30 @@ Additionally, the <literal>updating</lit
 using a stale cached response if it is currently being updated.
 This allows minimizing the number of accesses to proxied servers
 when updating cached data.
-The same behavior can be enabled with the
+</para>
+
+<para>
+Using a stale cached response
+can also be enabled directly in the response header
+for a specified number of seconds after the response became stale (1.11.10).
+This has lower priority than using the directive parameters.
+<list type="bullet" compact="no">
+
+<listitem>
+The
 “<link url="https://tools.ietf.org/html/rfc5861#section-3">stale-while-revalidate</link>”
-extension of the <header>Cache-Control</header> response header field (1.11.10)
-for a specified number of seconds after the response became stale,
-however, this has lower priority than using the directive parameter.
+extension of the <header>Cache-Control</header> header field permits
+using a stale cached response if it is currently being updated.
+</listitem>
+
+<listitem>
+The
+“<link url="https://tools.ietf.org/html/rfc5861#section-4">stale-if-error</link>”
+extension of the <header>Cache-Control</header> header field permits
+using a stale cached response in case of an error.
+</listitem>
+
+</list>
 </para>
 
 <para>