Mercurial > hg > nginx

changeset 7137:0e05b35beebf stable-1.12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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().
author Roman Arutyunyan <arut@nginx.com>
date Wed, 24 May 2017 13:17:08 +0300
parents d409ab1e8e4d
children 05bd1baabf87
files src/event/ngx_event_accept.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
         }