Mercurial > hg > nginx
view src/mail/ngx_mail_smtp_module.h @ 8058:f3510cb959d1
Events: fixed EPOLLRDHUP with FIONREAD (ticket #2367).
When reading exactly rev->available bytes, rev->available might become 0
after FIONREAD usage introduction in efd71d49bde0. On the next call of
ngx_readv_chain() on systems with EPOLLRDHUP this resulted in return without
any actions, that is, with rev->ready set, and this in turn resulted in no
timers set in event pipe, leading to socket leaks.
Fix is to reset rev->ready in ngx_readv_chain() when returning due to
rev->available being 0 with EPOLLRDHUP, much like it is already done in
ngx_unix_recv(). This ensures that if rev->available will become 0, on
systems with EPOLLRDHUP support appropriate EPOLLRDHUP-specific handling
will happen on the next ngx_readv_chain() call.
While here, also synced ngx_readv_chain() to match ngx_unix_recv() and
reset rev->ready when returning due to rev->available being 0 with kqueue.
This is mostly cosmetic change, as rev->ready is anyway reset when
rev->available is set to 0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 15 Jul 2022 15:19:32 +0300 |
parents | d620f497c50f |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #ifndef _NGX_MAIL_SMTP_MODULE_H_INCLUDED_ #define _NGX_MAIL_SMTP_MODULE_H_INCLUDED_ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_mail.h> #include <ngx_mail_smtp_module.h> typedef struct { ngx_msec_t greeting_delay; size_t client_buffer_size; ngx_str_t capability; ngx_str_t starttls_capability; ngx_str_t starttls_only_capability; ngx_str_t server_name; ngx_str_t greeting; ngx_uint_t auth_methods; ngx_array_t capabilities; } ngx_mail_smtp_srv_conf_t; void ngx_mail_smtp_init_session(ngx_mail_session_t *s, ngx_connection_t *c); void ngx_mail_smtp_init_protocol(ngx_event_t *rev); void ngx_mail_smtp_auth_state(ngx_event_t *rev); ngx_int_t ngx_mail_smtp_parse_command(ngx_mail_session_t *s); extern ngx_module_t ngx_mail_smtp_module; #endif /* _NGX_MAIL_SMTP_MODULE_H_INCLUDED_ */