Mercurial > hg > nginx-site
changeset 1060:b841fbb8c577
Clarified add_header inheritance.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 05 Feb 2014 18:30:15 +0400 |
parents | 76debe31d417 |
children | cb63563024eb |
files | xml/en/docs/http/ngx_http_headers_module.xml xml/ru/docs/http/ngx_http_headers_module.xml |
diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_headers_module.xml Tue Feb 04 17:39:03 2014 +0400 +++ b/xml/en/docs/http/ngx_http_headers_module.xml Wed Feb 05 18:30:15 2014 +0400 @@ -10,7 +10,7 @@ <module name="Module ngx_http_headers_module" link="/en/docs/http/ngx_http_headers_module.html" lang="en" - rev="4"> + rev="5"> <section id="summary"> @@ -56,6 +56,14 @@ A value can contain variables. </para> +<para> +There could be several <literal>add_header</literal> directives. +These directives are inherited from the previous level if and +only if there are no +<literal>add_header</literal> +directives defined on the current level. +</para> + </directive>
--- a/xml/ru/docs/http/ngx_http_headers_module.xml Tue Feb 04 17:39:03 2014 +0400 +++ b/xml/ru/docs/http/ngx_http_headers_module.xml Wed Feb 05 18:30:15 2014 +0400 @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_headers_module" link="/ru/docs/http/ngx_http_headers_module.html" lang="ru" - rev="4"> + rev="5"> <section id="summary"> @@ -56,6 +56,12 @@ В значении можно использовать переменные. </para> +<para> +Директив <literal>add_header</literal> может быть несколько. +Директивы наследуются с предыдущего уровня при условии, что на данном +уровне не описаны свои директивы <literal>add_header</literal>. +</para> + </directive>