Mercurial > hg > nginx-site
changeset 467:c505c92c8658
Documented recent changes to the "keepalive_disable" directive.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 28 Mar 2012 07:41:43 +0000 |
parents | 74736c333906 |
children | 31e81dcc4ffd |
files | xml/en/docs/http/ngx_http_core_module.xml xml/ru/docs/http/ngx_http_core_module.xml |
diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml +++ b/xml/en/docs/http/ngx_http_core_module.xml @@ -745,7 +745,7 @@ location /404.html { <directive name="keepalive_disable"> <syntax><literal>none</literal> | <value>browser</value> ...</syntax> -<default>msie6 safari</default> +<default>msie6</default> <context>http</context> <context>server</context> <context>location</context> @@ -757,9 +757,15 @@ browsers will be affected. The value <literal>msie6</literal> disables keep-alive connections with old versions of MSIE, after seeing a POST request. The value <literal>safari</literal> disables keep-alive connections -with Safari browsers. +with Safari and Safari-like browsers on Mac OS X and Mac OS X-like +operating systems. The value <literal>none</literal> enables keep-alive connections with all browsers. +<note> +Prior to version 1.1.18, the value <literal>safari</literal> matched +all Safari and Safari-like browsers on all operating systems, and +keep-alive connections with them were disabled by default. +</note> </para> </directive>
--- a/xml/ru/docs/http/ngx_http_core_module.xml +++ b/xml/ru/docs/http/ngx_http_core_module.xml @@ -730,7 +730,7 @@ location /404.html { <directive name="keepalive_disable"> <syntax><literal>none</literal> | <value>браузер</value> ...</syntax> -<default>msie6 safari</default> +<default>msie6</default> <context>http</context> <context>server</context> <context>location</context> @@ -742,9 +742,14 @@ location /404.html { Значение <literal>msie6</literal> запрещает keep-alive соединения со старыми версиями MSIE после получения запроса POST. Значение <literal>safari</literal> запрещает keep-alive соединения -с браузерами Safari. +с Safari и подобными им браузерами на Mac OS X и подобных ей ОС. Значение <literal>none</literal> разрешает keep-alive соединения со всеми браузерами. +<note> +До версии 1.1.18 под значение <literal>safari</literal> подпадали +все Sarari и подобные им браузеры на всех ОС, и keep-alive +соединения с ними были по умолчанию запрещены. +</note> </para> </directive>