Mercurial > hg > nginx-site
changeset 2736:48004177276d
Reordered methods in imap_auth and smtp_auth.
The "LOGIN" SASL mechanism is obsolete and expected to be only used for
compatibility. Accordingly, the corresponding "login" method is now listed
after the "plain" method.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Thu, 10 Jun 2021 18:34:32 +0300 |
| parents | ff357b676c2e |
| children | 9986e1f25cd7 |
| files | xml/en/docs/mail/ngx_mail_imap_module.xml xml/en/docs/mail/ngx_mail_smtp_module.xml xml/ru/docs/mail/ngx_mail_imap_module.xml xml/ru/docs/mail/ngx_mail_smtp_module.xml |
| diffstat | 4 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/mail/ngx_mail_imap_module.xml Thu Jun 10 18:27:24 2021 +0300 +++ b/xml/en/docs/mail/ngx_mail_imap_module.xml Thu Jun 10 18:34:32 2021 +0300 @@ -10,7 +10,7 @@ <module name="Module ngx_mail_imap_module" link="/en/docs/mail/ngx_mail_imap_module.html" lang="en" - rev="5"> + rev="6"> <section id="directives" name="Directives"> @@ -25,16 +25,16 @@ Supported methods are: <list type="tag"> +<tag-name><literal>plain</literal></tag-name> +<tag-desc> +<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link> +</tag-desc> + <tag-name><literal>login</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH=LOGIN</link> </tag-desc> -<tag-name><literal>plain</literal></tag-name> -<tag-desc> -<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link> -</tag-desc> - <tag-name><literal>cram-md5</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/rfc2195">AUTH=CRAM-MD5</link>.
--- a/xml/en/docs/mail/ngx_mail_smtp_module.xml Thu Jun 10 18:27:24 2021 +0300 +++ b/xml/en/docs/mail/ngx_mail_smtp_module.xml Thu Jun 10 18:34:32 2021 +0300 @@ -10,13 +10,13 @@ <module name="Module ngx_mail_smtp_module" link="/en/docs/mail/ngx_mail_smtp_module.html" lang="en" - rev="6"> + rev="7"> <section id="directives" name="Directives"> <directive name="smtp_auth"> <syntax><value>method</value> ...</syntax> -<default>login plain</default> +<default>plain login</default> <context>mail</context> <context>server</context> @@ -27,16 +27,16 @@ Supported methods are: <list type="tag"> +<tag-name><literal>plain</literal></tag-name> +<tag-desc> +<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link> +</tag-desc> + <tag-name><literal>login</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH LOGIN</link> </tag-desc> -<tag-name><literal>plain</literal></tag-name> -<tag-desc> -<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link> -</tag-desc> - <tag-name><literal>cram-md5</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/rfc2195">AUTH CRAM-MD5</link>.
--- a/xml/ru/docs/mail/ngx_mail_imap_module.xml Thu Jun 10 18:27:24 2021 +0300 +++ b/xml/ru/docs/mail/ngx_mail_imap_module.xml Thu Jun 10 18:34:32 2021 +0300 @@ -10,7 +10,7 @@ <module name="Модуль ngx_mail_imap_module" link="/ru/docs/mail/ngx_mail_imap_module.html" lang="ru" - rev="5"> + rev="6"> <section id="directives" name="Директивы"> @@ -25,16 +25,16 @@ Поддерживаемые методы: <list type="tag"> +<tag-name><literal>plain</literal></tag-name> +<tag-desc> +<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link> +</tag-desc> + <tag-name><literal>login</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH=LOGIN</link> </tag-desc> -<tag-name><literal>plain</literal></tag-name> -<tag-desc> -<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link> -</tag-desc> - <tag-name><literal>cram-md5</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/rfc2195">AUTH=CRAM-MD5</link>.
--- a/xml/ru/docs/mail/ngx_mail_smtp_module.xml Thu Jun 10 18:27:24 2021 +0300 +++ b/xml/ru/docs/mail/ngx_mail_smtp_module.xml Thu Jun 10 18:34:32 2021 +0300 @@ -10,13 +10,13 @@ <module name="Модуль ngx_mail_smtp_module" link="/ru/docs/mail/ngx_mail_smtp_module.html" lang="ru" - rev="6"> + rev="7"> <section id="directives" name="Директивы"> <directive name="smtp_auth"> <syntax><value>метод</value> ...</syntax> -<default>login plain</default> +<default>plain login</default> <context>mail</context> <context>server</context> @@ -27,16 +27,16 @@ Поддерживаемые методы: <list type="tag"> +<tag-name><literal>plain</literal></tag-name> +<tag-desc> +<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link> +</tag-desc> + <tag-name><literal>login</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH LOGIN</link> </tag-desc> -<tag-name><literal>plain</literal></tag-name> -<tag-desc> -<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link> -</tag-desc> - <tag-name><literal>cram-md5</literal></tag-name> <tag-desc> <link url="https://tools.ietf.org/html/rfc2195">AUTH CRAM-MD5</link>.