commit c48387e586ed0970c315280b56e75a8d8308c385
author Roman Arutyunyan <arut@nginx.com> Wed May 24 13:17:08 2017 +0300
committer Roman Arutyunyan <arut@nginx.com> Wed May 24 13:17:08 2017 +0300
tree 19dda4ce5c6028dd11770e812eb1dfa1e2ac5758
parent 789d6ab5c07cc115571f21d09846e7208c672860

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().

src/event/ngx_event_accept.c

diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 1fce2e8..87447d0 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -238,7 +238,7 @@
 
         if (ev->deferred_accept) {
             rev->ready = 1;
-#if (NGX_HAVE_KQUEUE)
+#if (NGX_HAVE_KQUEUE || NGX_HAVE_EPOLLRDHUP)
             rev->available = 1;
 #endif
         }