mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-28 10:10:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mail: don't emit separator in capability lists for APOP.

Browse Source 
Notably, this fixes CAPA and AUTH output.

The bug had appeared in nginx 1.11.6 (73b451d304c0).
This commit is contained in:
Sergey Kandaurov 2017-03-06 17:56:23 +03:00
parent 0f89206a10
commit fbe9759e4b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mail/ngx_mail_pop3_module.c
View File

@ -185,6 +185,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED; m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
m <<= 1, i++) m <<= 1, i++)
{ {
if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
continue;
}
if (m & conf->auth_methods) { if (m & conf->auth_methods) {
size += 1 + ngx_mail_pop3_auth_methods_names[i].len; size += 1 + ngx_mail_pop3_auth_methods_names[i].len;
} }
@ -212,6 +216,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED; m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
m <<= 1, i++) m <<= 1, i++)
{ {
if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
continue;
}
if (m & conf->auth_methods) { if (m & conf->auth_methods) {
*p++ = ' '; *p++ = ' ';
p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data, p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data,
@ -248,6 +256,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED; m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
m <<= 1, i++) m <<= 1, i++)
{ {
if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
continue;
}
if (m & conf->auth_methods) { if (m & conf->auth_methods) {
size += ngx_mail_pop3_auth_methods_names[i].len size += ngx_mail_pop3_auth_methods_names[i].len
+ sizeof(CRLF) - 1; + sizeof(CRLF) - 1;
@ -269,6 +281,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED; m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
m <<= 1, i++) m <<= 1, i++)
{ {
if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
continue;
}
if (m & conf->auth_methods) { if (m & conf->auth_methods) {
p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data, p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data,
ngx_mail_pop3_auth_methods_names[i].len); ngx_mail_pop3_auth_methods_names[i].len);