Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail_handler.c @ 403:d4cac61d8e95
Merge with nginx 0.6.5.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 23 Jul 2007 22:45:18 +0000 |
parents | f1e2fab7a46c d16d691432c9 |
children | 481e8f936572 |
comparison
equal
deleted
inserted
replaced
402:29cf4046a9a5 | 403:d4cac61d8e95 |
---|---|
1406 | 1406 |
1407 s->auth_method = NGX_MAIL_AUTH_CRAM_MD5; | 1407 s->auth_method = NGX_MAIL_AUTH_CRAM_MD5; |
1408 | 1408 |
1409 ngx_mail_do_auth(s); | 1409 ngx_mail_do_auth(s); |
1410 return; | 1410 return; |
1411 | |
1412 } | 1411 } |
1413 | 1412 |
1414 } else if (rc == NGX_IMAP_NEXT) { | 1413 } else if (rc == NGX_IMAP_NEXT) { |
1415 last = imap_next; | 1414 last = imap_next; |
1416 last_len = sizeof(imap_next) - 1; | 1415 last_len = sizeof(imap_next) - 1; |
1462 if (s->state) { | 1461 if (s->state) { |
1463 /* preserve tag */ | 1462 /* preserve tag */ |
1464 s->arg_start = s->buffer->start + s->tag.len; | 1463 s->arg_start = s->buffer->start + s->tag.len; |
1465 s->buffer->pos = s->arg_start; | 1464 s->buffer->pos = s->arg_start; |
1466 s->buffer->last = s->arg_start; | 1465 s->buffer->last = s->arg_start; |
1466 | |
1467 } else { | 1467 } else { |
1468 s->buffer->pos = s->buffer->start; | 1468 s->buffer->pos = s->buffer->start; |
1469 s->buffer->last = s->buffer->start; | 1469 s->buffer->last = s->buffer->start; |
1470 s->tag.len = 0; | 1470 s->tag.len = 0; |
1471 } | 1471 } |
1849 ngx_mail_ssl_module); | 1849 ngx_mail_ssl_module); |
1850 if (sslcf->starttls) { | 1850 if (sslcf->starttls) { |
1851 c->read->handler = ngx_mail_starttls_handler; | 1851 c->read->handler = ngx_mail_starttls_handler; |
1852 | 1852 |
1853 /* | 1853 /* |
1854 * RFC3207 requires us to discard any knowledge obtained | 1854 * RFC3207 requires us to discard any knowledge |
1855 * from client before STARTTLS. | 1855 * obtained from client before STARTTLS. |
1856 */ | 1856 */ |
1857 | 1857 |
1858 s->smtp_helo.len = 0; | 1858 s->smtp_helo.len = 0; |
1859 s->smtp_helo.data = NULL; | 1859 s->smtp_helo.data = NULL; |
1860 s->smtp_from.len = 0; | 1860 s->smtp_from.len = 0; |