From: Maxim Dounin <mdounin@mdounin.ru>
Date: Fri, 5 Mar 2021 14:16:15 +0000 (+0300)
Subject: Events: fixed eventport handling in ngx_handle_read_event().
X-Git-Tag: release-1.19.8~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d5a31fdad50dbd28974cb0eb7f23948241a7559e;p=nginx.git

Events: fixed eventport handling in ngx_handle_read_event().

The "!rev->ready" test seems to be a typo, introduced in the original
commit (719:f30b1a75fd3b).  The ngx_handle_write_event() code properly
tests for "rev->ready" instead.

Due to this typo, read events might be unexpectedly removed during
proxying after an event on the other part of the proxied connection.
Catched by mail proxying tests.
---

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 402a7f5e2..ed7b30bf3 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -318,7 +318,7 @@ ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
             return NGX_OK;
         }
 
-        if (rev->oneshot && !rev->ready) {
+        if (rev->oneshot && rev->ready) {
             if (ngx_del_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
                 return NGX_ERROR;
             }