merge r3451, r3506:

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 edebdd6404
commit e6365cd48e
2 changed files with 1 additions and 3 deletions

View File

@ -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;
}

View File

@ -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;
}