summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nginx/src/event/ngx_event.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/nginx/src/event/ngx_event.h')
-rw-r--r--usr.sbin/nginx/src/event/ngx_event.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/nginx/src/event/ngx_event.h b/usr.sbin/nginx/src/event/ngx_event.h
index 93c457c7b9a..530c9486c51 100644
--- a/usr.sbin/nginx/src/event/ngx_event.h
+++ b/usr.sbin/nginx/src/event/ngx_event.h
@@ -69,13 +69,9 @@ struct ngx_event_s {
unsigned delayed:1;
- unsigned read_discarded:1;
-
- unsigned unexpected_eof:1;
-
unsigned deferred_accept:1;
- /* the pending eof reported by kqueue or in aio chain operation */
+ /* the pending eof reported by kqueue, epoll or in aio chain operation */
unsigned pending_eof:1;
#if !(NGX_THREADS)
@@ -353,6 +349,11 @@ extern ngx_event_actions_t ngx_event_actions;
#define NGX_VNODE_EVENT 0
+#if (NGX_HAVE_EPOLL) && !(NGX_HAVE_EPOLLRDHUP)
+#define EPOLLRDHUP 0
+#endif
+
+
#if (NGX_HAVE_KQUEUE)
#define NGX_READ_EVENT EVFILT_READ
@@ -396,7 +397,7 @@ extern ngx_event_actions_t ngx_event_actions;
#elif (NGX_HAVE_EPOLL)
-#define NGX_READ_EVENT EPOLLIN
+#define NGX_READ_EVENT (EPOLLIN|EPOLLRDHUP)
#define NGX_WRITE_EVENT EPOLLOUT
#define NGX_LEVEL_EVENT 0