Mercurial > hg > nginx

comparison src/mail/ngx_mail_smtp_handler.c @ 2388:722b5aff05ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use "!= NGX_OK" instead of "== NGX_ERROR"
author Igor Sysoev <igor@sysoev.ru>
date Tue, 09 Dec 2008 17:27:48 +0000
parents 8156bc03982a
children ac695b3e981c
comparison
equal deleted inserted replaced
2387:7a1478c02415 2388:722b5aff05ae
226 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module); 226 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
227 227
228 timeout = sscf->greeting_delay ? sscf->greeting_delay : cscf->timeout; 228 timeout = sscf->greeting_delay ? sscf->greeting_delay : cscf->timeout;
229 ngx_add_timer(c->read, timeout); 229 ngx_add_timer(c->read, timeout);
230 230
231 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 231 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
232 ngx_mail_close_connection(c); 232 ngx_mail_close_connection(c);
233 } 233 }
234 234
235 if (sscf->greeting_delay) { 235 if (sscf->greeting_delay) {
236 c->read->handler = ngx_mail_smtp_invalid_pipelining; 236 c->read->handler = ngx_mail_smtp_invalid_pipelining;
268 268
269 c->read->handler = ngx_mail_smtp_init_protocol; 269 c->read->handler = ngx_mail_smtp_init_protocol;
270 270
271 ngx_add_timer(c->read, cscf->timeout); 271 ngx_add_timer(c->read, cscf->timeout);
272 272
273 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 273 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
274 ngx_mail_close_connection(c); 274 ngx_mail_close_connection(c);
275 return; 275 return;
276 } 276 }
277 277
278 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module); 278 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
817 if (n > 0) { 817 if (n > 0) {
818 s->buffer->last += n; 818 s->buffer->last += n;
819 } 819 }
820 820
821 if (n == NGX_AGAIN) { 821 if (n == NGX_AGAIN) {
822 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 822 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
823 ngx_mail_session_internal_server_error(s); 823 ngx_mail_session_internal_server_error(s);
824 return NGX_ERROR; 824 return NGX_ERROR;
825 } 825 }
826 826
827 return NGX_AGAIN; 827 return NGX_AGAIN;