Fixed deferred accept with EPOLLRDHUP enabled (ticket #1278).

Previously, the read event of the accepted connection was marked ready, but not
available.  This made EPOLLRDHUP-related code (for example, in ngx_unix_recv())
expect more data from the socket, leading to unexpected behavior.

For example, if SSL, PROXY protocol and deferred accept were enabled on a listen
socket, the client connection was aborted due to unexpected return value of
c->recv().
This commit is contained in:
Roman Arutyunyan 2017-05-24 13:17:08 +03:00
parent f13f641b67
commit cc68c10d40
1 changed files with 1 additions and 1 deletions

View File

@ -238,7 +238,7 @@ ngx_event_accept(ngx_event_t *ev)
if (ev->deferred_accept) {
rev->ready = 1;
#if (NGX_HAVE_KQUEUE)
#if (NGX_HAVE_KQUEUE || NGX_HAVE_EPOLLRDHUP)
rev->available = 1;
#endif
}