commit 615d55884376040fc2b42d9f47f981cd700b384a
author Valentin Bartenev <vbart@nginx.com> Sat Jul 13 03:24:30 2013 +0400
committer Valentin Bartenev <vbart@nginx.com> Sat Jul 13 03:24:30 2013 +0400
tree 58267bfbfcee2de0e4a8b344a8753a929eefdce2
parent d10251030ae4553e5f5338b267750f63cd05d1b3

Events: honor NGX_USE_GREEDY_EVENT when kqueue support is enabled.

Currently this flag is needed for epoll and rtsig, and though these methods
usually present on different platforms than kqueue, nginx can be compiled to
support all of them.

src/os/unix/ngx_readv_chain.c

diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index 7b6badf..c2c21b4 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -136,7 +136,7 @@
                 return n;
             }
 
-            if (n < size) {
+            if (n < size && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) {
                 rev->ready = 0;
             }
 

src/os/unix/ngx_recv.c

diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index 6a4a099..1640cdb 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -87,7 +87,9 @@
                 return n;
             }
 
-            if ((size_t) n < size) {
+            if ((size_t) n < size
+                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
+            {
                 rev->ready = 0;
             }