# HG changeset patch # User Maxim Dounin <mdou...@mdounin.ru> # Date 1725258906 -10800 # Mon Sep 02 09:35:06 2024 +0300 # Node ID ddf686b02cebbb264de66e59be32c8a7b228ea21 # Parent aea3e104f11deba904f88166ddd1befe79621ec1 Documented charset_types changes.
diff --git a/xml/en/docs/http/ngx_http_charset_module.xml b/xml/en/docs/http/ngx_http_charset_module.xml --- a/xml/en/docs/http/ngx_http_charset_module.xml +++ b/xml/en/docs/http/ngx_http_charset_module.xml @@ -10,7 +10,7 @@ <module name="Module ngx_http_charset_module" link="/en/docs/http/ngx_http_charset_module.html" lang="en" - rev="5"> + rev="6"> <section id="summary"> @@ -165,8 +165,8 @@ are provided in the distribution files < <directive name="charset_types"> <syntax><value>mime-type</value> ...</syntax> -<default>text/html text/xml text/plain text/vnd.wap.wml -application/javascript application/rss+xml</default> +<default>text/html text/xml text/javascript text/plain text/markdown +text/vnd.wap.wml application/javascript application/rss+xml</default> <context>http</context> <context>server</context> <context>location</context> @@ -180,9 +180,13 @@ The special value “<literal>*</literal>” matches any MIME type (0.8.29). <para> <note> -Until version 1.5.4, “<literal>application/x-javascript</literal>” was used +Prior to version 1.5.4, “<literal>application/x-javascript</literal>” was used as the default MIME type instead of “<literal>application/javascript</literal>”. </note> +<note> +Prior to version 1.27.4, the default value did not include +“<literal>text/javascript</literal>” and “<literal>text/markdown</literal>”. +</note> </para> </directive> diff --git a/xml/ru/docs/http/ngx_http_charset_module.xml b/xml/ru/docs/http/ngx_http_charset_module.xml --- a/xml/ru/docs/http/ngx_http_charset_module.xml +++ b/xml/ru/docs/http/ngx_http_charset_module.xml @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_charset_module" link="/ru/docs/http/ngx_http_charset_module.html" lang="ru" - rev="5"> + rev="6"> <section id="summary"> @@ -164,8 +164,8 @@ charset_map koi8-r utf-8 { <directive name="charset_types"> <syntax><value>mime-тип</value> ...</syntax> -<default>text/html text/xml text/plain text/vnd.wap.wml -application/javascript application/rss+xml</default> +<default>text/html text/xml text/javascript text/plain text/markdown +text/vnd.wap.wml application/javascript application/rss+xml</default> <context>http</context> <context>server</context> <context>location</context> @@ -184,6 +184,10 @@ application/javascript application/rss+x “<literal>application/javascript</literal>” использовался “<literal>application/x-javascript</literal>”. </note> +<note> +До версии 1.27.4 значение по умолчанию не включало +“<literal>text/javascript</literal>” и “<literal>text/markdown</literal>”. +</note> </para> </directive>