From: Roman Arutyunyan <arut@nginx.com>
Date: Wed, 24 May 2017 10:17:08 +0000 (+0300)
Subject: Fixed deferred accept with EPOLLRDHUP enabled (ticket #1278).
X-Git-Tag: release-1.13.1~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c83922b18ddc83f654c1d0df48a6ca1ee9938078;p=nginx.git

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

diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 1fce2e89b..87447d089 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -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
         }