Mercurial > hg > nginx-quic
comparison src/mail/ngx_mail_imap_handler.c @ 8339: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 | ccdf83bee8c1 |
comparison
equal
deleted
inserted
replaced
8338:ab6257dac2a8 | 8339:da0a85e91587 |
---|---|
134 | 134 |
135 s->blocked = 0; | 135 s->blocked = 0; |
136 | 136 |
137 rc = ngx_mail_read_command(s, c); | 137 rc = ngx_mail_read_command(s, c); |
138 | 138 |
139 if (rc == NGX_AGAIN || rc == NGX_ERROR) { | 139 if (rc == NGX_AGAIN) { |
140 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { | |
141 ngx_mail_session_internal_server_error(s); | |
142 return; | |
143 } | |
144 | |
145 return; | |
146 } | |
147 | |
148 if (rc == NGX_ERROR) { | |
140 return; | 149 return; |
141 } | 150 } |
142 | 151 |
143 tag = 1; | 152 tag = 1; |
144 s->text.len = 0; | 153 s->text.len = 0; |
295 } else { | 304 } else { |
296 s->buffer->pos = s->buffer->start; | 305 s->buffer->pos = s->buffer->start; |
297 s->buffer->last = s->buffer->start; | 306 s->buffer->last = s->buffer->start; |
298 s->tag.len = 0; | 307 s->tag.len = 0; |
299 } | 308 } |
309 } | |
310 | |
311 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { | |
312 ngx_mail_session_internal_server_error(s); | |
313 return; | |
300 } | 314 } |
301 | 315 |
302 ngx_mail_send(c->write); | 316 ngx_mail_send(c->write); |
303 } | 317 } |
304 | 318 |