comparison src/mail/ngx_mail_smtp_handler.c @ 7790:da0a85e91587

Mail: added missing event handling after reading data. If we need to be notified about further events, ngx_handle_read_event() needs to be called after a read event is processed. Without this, an event can be removed from the kernel and won't be reported again, notably when using oneshot event methods, such as eventport on Solaris. For consistency, existing ngx_handle_read_event() call removed from ngx_mail_read_command(), as this call only covers one of the code paths where ngx_mail_read_command() returns NGX_AGAIN. Instead, appropriate processing added to the callers, covering all code paths where NGX_AGAIN is returned.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 05 Mar 2021 17:16:17 +0300
parents ab6257dac2a8
children c690a902bfec
comparison
equal deleted inserted replaced
7789:ab6257dac2a8 7790:da0a85e91587
460 460
461 s->blocked = 0; 461 s->blocked = 0;
462 462
463 rc = ngx_mail_read_command(s, c); 463 rc = ngx_mail_read_command(s, c);
464 464
465 if (rc == NGX_AGAIN || rc == NGX_ERROR) { 465 if (rc == NGX_AGAIN) {
466 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
467 ngx_mail_session_internal_server_error(s);
468 return;
469 }
470
471 return;
472 }
473
474 if (rc == NGX_ERROR) {
466 return; 475 return;
467 } 476 }
468 477
469 ngx_str_set(&s->out, smtp_ok); 478 ngx_str_set(&s->out, smtp_ok);
470 479
572 581
573 if (s->state) { 582 if (s->state) {
574 s->arg_start = s->buffer->pos; 583 s->arg_start = s->buffer->pos;
575 } 584 }
576 585
586 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
587 ngx_mail_session_internal_server_error(s);
588 return;
589 }
590
577 ngx_mail_send(c->write); 591 ngx_mail_send(c->write);
578 } 592 }
579 } 593 }
580 594
581 595