IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge r3451, r3506:

Browse Source 
mail related fixes:

*) delete surplus code
*) Zimbra IMAP server may return only 4 bytes: "+ \r\n"
This commit is contained in:
Igor Sysoev 2010-06-07 09:25:39 +00:00
parent da6332fa98
commit 3b755fc6c4
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mail/ngx_mail_pop3_handler.c
View File

@ -188,7 +188,6 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
default: default:
rc = NGX_MAIL_PARSE_INVALID_COMMAND; rc = NGX_MAIL_PARSE_INVALID_COMMAND;
s->mail_state = ngx_pop3_start;
break; break;
} }
@ -215,7 +214,6 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
default: default:
rc = NGX_MAIL_PARSE_INVALID_COMMAND; rc = NGX_MAIL_PARSE_INVALID_COMMAND;
s->mail_state = ngx_pop3_start;
break; break;
} }

2
src/mail/ngx_mail_proxy_module.c
View File

@ -726,7 +726,7 @@ ngx_mail_proxy_read_response(ngx_mail_session_t *s, ngx_uint_t state)
b->last += n; b->last += n;
if (b->last - b->pos < 5) { if (b->last - b->pos < 4) {
return NGX_AGAIN; return NGX_AGAIN;
} }