Mercurial > hg > nginx

comparison src/mail/ngx_mail_smtp_handler.c @ 1486:0e7074ef7303

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix: remove trailing spaces
author Igor Sysoev <igor@sysoev.ru>
date Fri, 14 Sep 2007 15:04:45 +0000
parents b3488fc2675a
children f69493e8faab
comparison
equal deleted inserted replaced
1485:b3488fc2675a 1486:0e7074ef7303
46 46
47 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); 47 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
48 48
49 timeout = cscf->smtp_greeting_delay ? cscf->smtp_greeting_delay: 49 timeout = cscf->smtp_greeting_delay ? cscf->smtp_greeting_delay:
50 cscf->timeout; 50 cscf->timeout;
51 ngx_add_timer(c->read, timeout); 51 ngx_add_timer(c->read, timeout);
52 52
53 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 53 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
54 ngx_mail_close_connection(c); 54 ngx_mail_close_connection(c);
55 } 55 }
56 56
87 87
88 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); 88 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
89 89
90 c->read->handler = ngx_mail_smtp_init_protocol; 90 c->read->handler = ngx_mail_smtp_init_protocol;
91 91
92 ngx_add_timer(c->read, cscf->timeout); 92 ngx_add_timer(c->read, cscf->timeout);
93 93
94 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 94 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
95 ngx_mail_close_connection(c); 95 ngx_mail_close_connection(c);
96 return; 96 return;
97 } 97 }
286 ngx_mail_session_internal_server_error(s); 286 ngx_mail_session_internal_server_error(s);
287 return; 287 return;
288 288
289 case NGX_MAIL_PARSE_INVALID_COMMAND: 289 case NGX_MAIL_PARSE_INVALID_COMMAND:
290 s->mail_state = ngx_smtp_start; 290 s->mail_state = ngx_smtp_start;
291 s->state = 0; 291 s->state = 0;
292 292
293 s->out.len = sizeof(smtp_invalid_command) - 1; 293 s->out.len = sizeof(smtp_invalid_command) - 1;
294 s->out.data = smtp_invalid_command; 294 s->out.data = smtp_invalid_command;
295 295
296 /* fall through */ 296 /* fall through */
488 } 488 }
489 489
490 if (n > 0) { 490 if (n > 0) {
491 s->buffer->last += n; 491 s->buffer->last += n;
492 } 492 }
493 493
494 if (n == NGX_AGAIN) { 494 if (n == NGX_AGAIN) {
495 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 495 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
496 ngx_mail_session_internal_server_error(s); 496 ngx_mail_session_internal_server_error(s);
497 return NGX_ERROR; 497 return NGX_ERROR;
498 } 498 }