diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:25:39 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:25:39 +0000 |
| commit | 3b755fc6c441867122a6fe575152a52be48d1eb0 (patch) | |
| tree | 8dc99b66d2e4b8f5582fd91a18522e3a9147122e | |
| parent | da6332fa98b2821453ed010697dcbd254db3991b (diff) | |
| download | nginx-3b755fc6c441867122a6fe575152a52be48d1eb0.tar.gz | |
merge r3451, r3506:
mail related fixes:
*) delete surplus code
*) Zimbra IMAP server may return only 4 bytes: "+ \r\n"
| -rw-r--r-- | src/mail/ngx_mail_pop3_handler.c | 2 | ||||
| -rw-r--r-- | src/mail/ngx_mail_proxy_module.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/mail/ngx_mail_pop3_handler.c b/src/mail/ngx_mail_pop3_handler.c index aed662919..d22ba5ebf 100644 --- a/src/mail/ngx_mail_pop3_handler.c +++ b/src/mail/ngx_mail_pop3_handler.c @@ -188,7 +188,6 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev) default: rc = NGX_MAIL_PARSE_INVALID_COMMAND; - s->mail_state = ngx_pop3_start; break; } @@ -215,7 +214,6 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev) default: rc = NGX_MAIL_PARSE_INVALID_COMMAND; - s->mail_state = ngx_pop3_start; break; } diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c index b408ed7d3..3a9a6bec5 100644 --- a/src/mail/ngx_mail_proxy_module.c +++ b/src/mail/ngx_mail_proxy_module.c @@ -726,7 +726,7 @@ ngx_mail_proxy_read_response(ngx_mail_session_t *s, ngx_uint_t state) b->last += n; - if (b->last - b->pos < 5) { + if (b->last - b->pos < 4) { return NGX_AGAIN; } |