Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail_handler.c @ 467:d67e93e97b4a
Merge with nginx 0.7.30.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 11 Jan 2009 17:17:57 +0300 |
parents | 9b19e26b2660 dac47e9ef0d5 |
children | 2580fe1c5a9a |
comparison
equal
deleted
inserted
replaced
444:4c92e29a7375 | 467:d67e93e97b4a |
---|---|
511 ngx_mail_close_connection(c); | 511 ngx_mail_close_connection(c); |
512 return; | 512 return; |
513 } | 513 } |
514 | 514 |
515 if (s->out.len == 0) { | 515 if (s->out.len == 0) { |
516 if (ngx_handle_write_event(c->write, 0) == NGX_ERROR) { | 516 if (ngx_handle_write_event(c->write, 0) != NGX_OK) { |
517 ngx_mail_close_connection(c); | 517 ngx_mail_close_connection(c); |
518 } | 518 } |
519 | 519 |
520 return; | 520 return; |
521 } | 521 } |
550 | 550 |
551 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); | 551 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); |
552 | 552 |
553 ngx_add_timer(c->write, cscf->timeout); | 553 ngx_add_timer(c->write, cscf->timeout); |
554 | 554 |
555 if (ngx_handle_write_event(c->write, 0) == NGX_ERROR) { | 555 if (ngx_handle_write_event(c->write, 0) != NGX_OK) { |
556 ngx_mail_close_connection(c); | 556 ngx_mail_close_connection(c); |
557 return; | 557 return; |
558 } | 558 } |
559 } | 559 } |
560 | 560 |
577 if (n > 0) { | 577 if (n > 0) { |
578 s->buffer->last += n; | 578 s->buffer->last += n; |
579 } | 579 } |
580 | 580 |
581 if (n == NGX_AGAIN) { | 581 if (n == NGX_AGAIN) { |
582 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { | 582 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { |
583 ngx_mail_session_internal_server_error(s); | 583 ngx_mail_session_internal_server_error(s); |
584 return NGX_ERROR; | 584 return NGX_ERROR; |
585 } | 585 } |
586 | 586 |
587 if (s->buffer->pos == s->buffer->last) { | 587 if (s->buffer->pos == s->buffer->last) { |