diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2017-05-24 13:17:08 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2017-05-24 13:17:08 +0300 |
| commit | 67635190b3e74f6dc6b90ab53ca78ae490e6adc1 (patch) | |
| tree | 64f86ec1e088260ecab5104e4c43dacf157792a4 | |
| parent | b97145ae6c3fa65b59bff5cb08f72e554c558104 (diff) | |
| download | nginx-67635190b3e74f6dc6b90ab53ca78ae490e6adc1.tar.gz | |
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().
| -rw-r--r-- | src/event/ngx_event_accept.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |