From: Maxim Dounin <mdounin@mdounin.ru>
Date: Thu, 1 Sep 2011 15:10:41 +0000 (+0000)
Subject: Proper setting of read->eof in pipe code.
X-Git-Tag: release-1.1.2~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=82854d0d78a24fcbcf16dbf486cf60421f73096b;p=nginx.git

Proper setting of read->eof in pipe code.

Setting read->eof to 0 seems to be just a typo.  It appeared in
nginx-0.0.1-2003-10-28-18:45:41 import (r164), while identical code in
ngx_recv.c introduced in the same import do actually set read->eof to 1.

Failure to set read->eof to 1 results in EOF not being generally detectable
from connection flags.  On the other hand, kqueue won't report any read
events on such a connection since we use EV_CLEAR.  This resulted in read
timeouts if such connection was cached and used for another request.
---

diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index d01b20446..53d738f0a 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -149,7 +149,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
                 && p->upstream->read->pending_eof)
             {
                 p->upstream->read->ready = 0;
-                p->upstream->read->eof = 0;
+                p->upstream->read->eof = 1;
                 p->upstream_eof = 1;
                 p->read = 1;